Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wine && mumble -- Fixes for post multiple-output issues #14776

Merged
merged 2 commits into from
Apr 17, 2016
Merged

wine && mumble -- Fixes for post multiple-output issues #14776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ceeb22
mumble: fix build after closure-size merge
avnik Apr 17, 2016
9751cd4
wine: Fix RPATH for multiple-outputs
avnik Apr 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/applications/networking/mumble/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ let
++ (overrides.configureFlags or [ ]);

configurePhase = ''
runHook preConfigure
qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib"
runHook postConfigure
'';

makeFlags = [ "release" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/misc/emulators/wine/base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath " + path) (
map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ (map (x: x.lib or x.out) buildInputs))
# libpulsecommon.so is linked but not found otherwise
++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
);
Expand Down