diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-14 19:00:39 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:24:39 +0300 |
| commit | 5ff40ddedfe3188749faa21d71ac013277aff1d1 (patch) | |
| tree | 04a39e7c45ffbd82e17fc22c2a4998d0d34787f3 /pkgs/misc/emulators/wine | |
| parent | c779e30d531032a7744685e80c2143b358efe1b0 (diff) | |
| download | nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.gz nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.bz2 nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.lz nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.xz nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.zst nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.zip | |
add get* helper functions and mass-replace manual outputs search with them
Diffstat (limited to 'pkgs/misc/emulators/wine')
| -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 804eb0bb304c..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/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 |