Merge pull request #106800 from MetaDark/protontricks

protontricks: 1.4.2 -> 1.4.3
2020-12-30 01:06:55 -03:00
parent c04fc54d39 57c9834f7d
commit 4f5ae3e7d2
4 changed files with 288 additions and 30 deletions
@@ -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)" ];