alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #144881 from vs49688/wtfix

Browse source 
winetricks: remove wine dependency
This commit is contained in:
Michele Guerini Rocco 2021-11-07 12:33:09 +01:00 committed by GitHub
parent d1a8806e39 68ca39a775
commit d631a73345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/games/grapejuice/default.nix
View file

@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec {
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 = ''

8
pkgs/misc/emulators/wine/winetricks.nix
View file

@ -1,4 +1,4 @@
{ 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 {
@ -9,9 +9,9 @@ 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)" ];

8
pkgs/top-level/all-packages.nix
View file

@ -30450,13 +30450,7 @@ with pkgs;
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;