public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wine: fix infinite recursion in wine-staging build

Browse Source
This commit is contained in:
Herwig Hochleitner 2015-10-28 21:39:46 +01:00 committed by Nikolay Amiantov
parent accc98ca7f
commit 2145c99ae3
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/misc/emulators/wine/default.nix
View File

@ -6,17 +6,20 @@
# }; # };
# Make additional configurations on demand: # Make additional configurations on demand:
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; # wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
{ lib, pkgs, system, callPackage, wineUnstable, { lib, pkgs, system, callPackage,
wineRelease ? "stable", wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }: libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
if wineRelease == "staging" then let wine-build = build: release:
lib.getAttr build (callPackage ./packages.nix {
wineRelease = release;
});
in if wineRelease == "staging" then
callPackage ./staging.nix { callPackage ./staging.nix {
inherit libtxc_dxtn_Name; inherit libtxc_dxtn_Name;
wine = wineUnstable; wineUnstable = wine-build wineBuild "unstable";
} }
else else
lib.getAttr wineBuild (callPackage ./packages.nix { wine-build wineBuild wineRelease
inherit wineRelease;
})

8
pkgs/misc/emulators/wine/staging.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, lib, fetchFromGitHub, wine, libtxc_dxtn_Name }: { stdenv, callPackage, lib, fetchFromGitHub, wineUnstable, libtxc_dxtn_Name }:
with callPackage ./util.nix {}; with callPackage ./util.nix {};
@ -11,10 +11,10 @@ let v = (import ./versions.nix).staging;
rev = "v${version}"; rev = "v${version}";
}; };
build-inputs = pkgNames: extra: build-inputs = pkgNames: extra:
(mkBuildInputs wine.pkgArches pkgNames) ++ extra; (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
in assert (builtins.parseDrvName wine.name).version == version; in assert (builtins.parseDrvName wineUnstable.name).version == version;
stdenv.lib.overrideDerivation wine (self: { stdenv.lib.overrideDerivation wineUnstable (self: {
nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs;
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;