winetricks: remove wine dependency

It shouldn't be tied to a particular Wine installation, it should use
the one in $PATH. Also massively reduces the closure size.

pkgs/games/grapejuice/default.nix

···
 
   makeWrapperArgs = [
     "\${gappsWrapperArgs[@]}"
-    "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine (winetricks.override { wine = wine; }) ]}"
+    "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks ]}"
   ];
 
   postPatch = ''

pkgs/misc/emulators/wine/winetricks.nix

···
-{ lib, stdenv, callPackage, wine, perl, which, coreutils, zenity, curl
+{ lib, stdenv, callPackage, perl, which, coreutils, zenity, curl
 , cabextract, unzip, p7zip, gnused, gnugrep, bash } :
 
 stdenv.mkDerivation rec {
···
   buildInputs = [ perl which ];
 
   # coreutils is for sha1sum
-  pathAdd = lib.concatMapStringsSep ":" (x: x + "/bin")
-    (lib.filter (x: x != null)
-      [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]);
+  pathAdd = lib.makeBinPath [
+    perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash
+  ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 

pkgs/top-level/all-packages.nix

···
   steam-acf = callPackage ../tools/games/steam-acf { };
 
   protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
-    winetricks = winetricks.override {
-      # Remove default build of wine to reduce closure size.
-      # Falls back to wine in PATH.
-      wine = null;
-    };
-
-    inherit steam-run yad;
+    inherit winetricks steam-run yad;
   };
 
   protonup = with python3Packages; toPythonApplication protonup;