diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-30 06:22:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 06:22:20 +0000 |
| commit | 056304189c3fce8a784511afdb36c8db8caf44ff (patch) | |
| tree | 4be0942f0eaf063f741bc840812f68ae8714f85b /pkgs/misc/emulators | |
| parent | 31fc47581244ce947c2e91f817bc823c000c4c35 (diff) | |
| parent | 5dbf5f90d97c0af9efd36ecfdb8648e74ce39532 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/winetricks.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index ab183dfd38eec..cfb35a9f99635 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { # coreutils is for sha1sum pathAdd = stdenv.lib.concatMapStringsSep ":" (x: x + "/bin") - [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]; + (stdenv.lib.filter (x: x != null) + [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]); makeFlags = [ "PREFIX=$(out)" ]; |