public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14776 from avnik/fixes 

wine && mumble -- Fixes for post multiple-output issues
This commit is contained in:
Nikolay Amiantov 2016-04-17 20:04:51 +04:00
parent 6e802a531a 9751cd456a
commit ce47fb38d8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/mumble/default.nix
View File

@ -40,7 +40,9 @@ let
++ (overrides.configureFlags or [ ]); ++ (overrides.configureFlags or [ ]);
configurePhase = '' configurePhase = ''
runHook preConfigure
qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib" qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib"
runHook postConfigure
''; '';
makeFlags = [ "release" ]; makeFlags = [ "release" ];

2
pkgs/misc/emulators/wine/base.nix
View File

@ -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 # them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH. # LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath " + 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 # libpulsecommon.so is linked but not found otherwise
++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) ++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
); );