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-11-15 16:03:54 +03:00
committed by Nikolay Amiantov
parent accc98ca7f
commit 2145c99ae3
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/wine/default.nix
+9 -6
View File
@@ -6,17 +6,20 @@
# };
# Make additional configurations on demand:
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
{ lib, pkgs, system, callPackage, wineUnstable,
{ lib, pkgs, system, callPackage,
wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
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 {
inherit libtxc_dxtn_Name;
wine = wineUnstable;
wineUnstable = wine-build wineBuild "unstable";
}
else
lib.getAttr wineBuild (callPackage ./packages.nix {
inherit wineRelease;
})
wine-build wineBuild wineRelease