Merge pull request #40620 from NixOS/yegortimoshenko-patch-4

top-level: build winePackages on Hydra
This commit is contained in:
Yegor Timoshenko 2018-05-17 11:52:49 +03:00 committed by GitHub
commit 910644ef50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 48 deletions

View File

@ -21212,54 +21212,7 @@ with pkgs;
pythonPackages = python3Packages;
};
winePackages = rec {
minimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable";
wineBuild = config.wine.build or "wine32";
};
base = minimal.override {
pngSupport = true;
jpegSupport = true;
tiffSupport = true;
gettextSupport = true;
fontconfigSupport = true;
alsaSupport = true;
openglSupport = true;
vulkanSupport = stdenv.isLinux;
tlsSupport = true;
cupsSupport = true;
dbusSupport = true;
cairoSupport = true;
cursesSupport = true;
saneSupport = true;
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
udevSupport = true;
xineramaSupport = true;
xmlSupport = true;
};
full = base.override {
gtkSupport = true;
gstreamerSupport = true;
colorManagementSupport = true;
mpg123Support = true;
openalSupport = true;
openclSupport = true;
odbcSupport = true;
netapiSupport = true;
vaSupport = true;
pcapSupport = true;
v4lSupport = true;
gsmSupport = true;
gphoto2Support = true;
ldapSupport = true;
};
stable = base.override { wineRelease = "stable"; };
unstable = base.override { wineRelease = "unstable"; };
staging = base.override { wineRelease = "staging"; };
};
winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { });
wine = winePackages.full;

View File

@ -0,0 +1,50 @@
{ stdenv, config, callPackage }:
rec {
minimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable";
wineBuild = config.wine.build or "wine32";
};
base = minimal.override {
pngSupport = true;
jpegSupport = true;
tiffSupport = true;
gettextSupport = true;
fontconfigSupport = true;
alsaSupport = true;
openglSupport = true;
vulkanSupport = stdenv.isLinux;
tlsSupport = true;
cupsSupport = true;
dbusSupport = true;
cairoSupport = true;
cursesSupport = true;
saneSupport = true;
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
udevSupport = true;
xineramaSupport = true;
xmlSupport = true;
};
full = base.override {
gtkSupport = true;
gstreamerSupport = true;
colorManagementSupport = true;
mpg123Support = true;
openalSupport = true;
openclSupport = true;
odbcSupport = true;
netapiSupport = true;
vaSupport = true;
pcapSupport = true;
v4lSupport = true;
gsmSupport = true;
gphoto2Support = true;
ldapSupport = true;
};
stable = base.override { wineRelease = "stable"; };
unstable = base.override { wineRelease = "unstable"; };
staging = base.override { wineRelease = "staging"; };
}