Merge master into staging-next

2020-12-30 06:22:20 +00:00
parent 31fc475812 5dbf5f90d9
commit 056304189c
45 changed files with 5641 additions and 5449 deletions
--- 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)" ];