diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2016-04-17 18:50:22 +0300 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2016-04-17 18:51:34 +0300 |
| commit | 9751cd456a869315b02028c7f18e9aeb9443b382 (patch) | |
| tree | 817c438d02ec0d8643c67f217c5665b9ae7b8a50 /pkgs/misc/emulators/wine/base.nix | |
| parent | 3ceeb22ea8e10cf7f49563a118121f7119b1a428 (diff) | |
| download | nixlib-9751cd456a869315b02028c7f18e9aeb9443b382.tar nixlib-9751cd456a869315b02028c7f18e9aeb9443b382.tar.gz nixlib-9751cd456a869315b02028c7f18e9aeb9443b382.tar.bz2 nixlib-9751cd456a869315b02028c7f18e9aeb9443b382.tar.lz nixlib-9751cd456a869315b02028c7f18e9aeb9443b382.tar.xz nixlib-9751cd456a869315b02028c7f18e9aeb9443b382.tar.zst nixlib-9751cd456a869315b02028c7f18e9aeb9443b382.zip | |
wine: Fix RPATH for multiple-outputs
Diffstat (limited to 'pkgs/misc/emulators/wine/base.nix')
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 503e8da6845e..2af403c4deaf 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 ]))) ); |