lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

+6 -12
+1 -1
pkgs/games/grapejuice/default.nix
··· 49 49 50 50 makeWrapperArgs = [ 51 51 "\${gappsWrapperArgs[@]}" 52 - "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine (winetricks.override { wine = wine; }) ]}" 52 + "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks ]}" 53 53 ]; 54 54 55 55 postPatch = ''
+4 -4
pkgs/misc/emulators/wine/winetricks.nix
··· 1 - { lib, stdenv, callPackage, wine, perl, which, coreutils, zenity, curl 1 + { lib, stdenv, callPackage, perl, which, coreutils, zenity, curl 2 2 , cabextract, unzip, p7zip, gnused, gnugrep, bash } : 3 3 4 4 stdenv.mkDerivation rec { ··· 9 9 buildInputs = [ perl which ]; 10 10 11 11 # coreutils is for sha1sum 12 - pathAdd = lib.concatMapStringsSep ":" (x: x + "/bin") 13 - (lib.filter (x: x != null) 14 - [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]); 12 + pathAdd = lib.makeBinPath [ 13 + perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash 14 + ]; 15 15 16 16 makeFlags = [ "PREFIX=$(out)" ]; 17 17
+1 -7
pkgs/top-level/all-packages.nix
··· 30450 30450 steam-acf = callPackage ../tools/games/steam-acf { }; 30451 30451 30452 30452 protontricks = python3Packages.callPackage ../tools/package-management/protontricks { 30453 - winetricks = winetricks.override { 30454 - # Remove default build of wine to reduce closure size. 30455 - # Falls back to wine in PATH. 30456 - wine = null; 30457 - }; 30458 - 30459 - inherit steam-run yad; 30453 + inherit winetricks steam-run yad; 30460 30454 }; 30461 30455 30462 30456 protonup = with python3Packages; toPythonApplication protonup;