From 3ceeb22ea8e10cf7f49563a118121f7119b1a428 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 17 Apr 2016 18:50:06 +0300 Subject: [PATCH 1/2] mumble: fix build after closure-size merge --- pkgs/applications/networking/mumble/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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" ]; From 9751cd456a869315b02028c7f18e9aeb9443b382 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 17 Apr 2016 18:50:22 +0300 Subject: [PATCH 2/2] wine: Fix RPATH for multiple-outputs --- pkgs/misc/emulators/wine/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ]))) );