diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 20:04:51 +0400 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 20:04:51 +0400 |
commit | ce47fb38d8206c5c1674baf9ed048a5660186c24 (patch) | |
tree | 165be9e1d812ed6c7cd25e423a011f6ae9d38f20 /pkgs | |
parent | 6e802a531a7a2d4af38f7d0001437868298fa08e (diff) | |
parent | 9751cd456a869315b02028c7f18e9aeb9443b382 (diff) |
Merge pull request #14776 from avnik/fixes
wine && mumble -- Fixes for post multiple-output issues
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 12c250ab28bbe..646e3dfdd0bbd 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -40,7 +40,9 @@ let ++ (overrides.configureFlags or [ ]); configurePhase = '' + runHook preConfigure qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib" + runHook postConfigure ''; makeFlags = [ "release" ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 503e8da6845e6..2af403c4deaf8 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -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 ]))) ); |