diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:36:23 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:36:23 +0100 |
| commit | e5381cdeceeb150535998cee5518e6fa678e4dc0 (patch) | |
| tree | f0ba4eaa3e0d2c5e2cdfd55e18c1953b1ad9a854 /pkgs/misc | |
| parent | d84a33d85b621f4621f4e4da1c74b8ad896a349e (diff) | |
| parent | 7d864c6bd6391baa516118051ec5fb7e9836280e (diff) | |
| download | nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.gz nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.bz2 nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.lz nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.xz nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.zst nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -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 94cf4a774569..2b9d048f77e6 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals stdenv.isLinux (with pkgs.xorg; [ libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]) - ++ [ pkgs.xorg.libX11 ])); + ++ [ pkgs.xorg.libX11 pkgs.perl ])); # 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 |