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

wine: enable 64bit build for wineStaging

Browse Source
This commit is contained in:
Herwig Hochleitner
2015-05-18 21:01:54 +02:00
parent 023aaf8f6d
commit ef9cfd3dda
7 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/wine/default.nix
+14 -7
View File
@@ -1,15 +1,22 @@
## Configuration:
# Control you default wine config in nixpkgs-config:
# wine = {
# release = "stable"; # "stable", "unstable"
# release = "stable"; # "stable", "unstable", "staging"
# build = "wineWow"; # "wine32", "wine64", "wineWow"
# };
# Make additional configurations on demand:
# wine.overrideConfig { build = "wine32"; };
{ lib, system, callPackage,
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
{ lib, pkgs, system, callPackage,
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" }:
lib.getAttr wineBuild (callPackage ./packages.nix {
inherit wineRelease;
})
if wineRelease == "staging" then
callPackage ./staging.nix {
inherit libtxc_dxtn_Name;
wine = lib.getAttr wineBuild (callPackage ./packages.nix { wineRelease = "unstable"; });
}
else
lib.getAttr wineBuild (callPackage ./packages.nix {
inherit wineRelease;
})