Merge pull request #43065 from gnidorah/wine

wine: build wineWow packages on hydra
This commit is contained in:
Matthew Bauer
2018-07-05 11:41:36 -04:00
committed by GitHub
2 changed files with 13 additions and 3 deletions
+11 -1
View File
@@ -21590,7 +21590,17 @@ with pkgs;
pythonPackages = python3Packages; pythonPackages = python3Packages;
}; };
winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { }); winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {
callPackage = newScope self;
inherit wineBuild;
inherit (callPackage ./wine-packages.nix {})
minimal base full stable unstable staging;
});
winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow");
wine = winePackages.full; wine = winePackages.full;
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, config, callPackage }: { stdenv, config, callPackage, wineBuild }:
rec { rec {
minimal = callPackage ../misc/emulators/wine { minimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable"; wineRelease = config.wine.release or "stable";
wineBuild = config.wine.build or "wine32"; inherit wineBuild;
}; };
base = minimal.override { base = minimal.override {