swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-23 13:45:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43065 from gnidorah/wine

Browse source 
wine: build wineWow packages on hydra
This commit is contained in:
Matthew Bauer 2018-07-05 11:41:36 -04:00 committed by GitHub
parent a6891620e3 301789b473
commit 00b44dcb01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -21590,7 +21590,17 @@ with pkgs;
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;

4
pkgs/top-level/wine-packages.nix
View file

@ -1,9 +1,9 @@
{ stdenv, config, callPackage }:
{ stdenv, config, callPackage, wineBuild }:
rec {
minimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable";
wineBuild = config.wine.build or "wine32";
inherit wineBuild;
};
base = minimal.override {