diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/misc/emulators | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
| download | nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2 nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 60fb8e11391b..0398ed57a702 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -32,9 +32,10 @@ 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 ] ++ (map (x: x.lib or x.out) buildInputs)) + map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) # libpulsecommon.so is linked but not found otherwise - ++ lib.optionals pulseaudioSupport (map (x: "${x.lib or x.out}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) + ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") + (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) ); # Don't shrink the ELF RPATHs in order to keep the extra RPATH |