diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 03:23:29 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:15:46 +0100 |
| commit | f9f46dc327c7e659e84d558f1309e16e16e8245a (patch) | |
| tree | f402e0b62191769e95e3199c3f635bb8ed7a6da3 /pkgs/misc/emulators | |
| parent | 5f2b92e3eca8bd2d34d98e82d63783f281363f8f (diff) | |
| download | nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.gz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.bz2 nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.lz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.xz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.zst nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.zip | |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 057615a79a1..0b6eab70263 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -71,12 +71,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath " + path) ( + NIX_LDFLAGS = toString (map (path: "-rpath " + path) ( map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.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 # elements specified above. |