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

wine: build wineWow packages on hydra

Browse Source
This commit is contained in:
gnidorah 2018-07-03 21:26:34 +03:00
parent be1461fc0a
commit 301789b473
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/all-packages.nix
View File

@ -21596,7 +21596,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;

4
pkgs/top-level/wine-packages.nix
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 {