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

wine: set default features in all-packages

Browse Source 
I haven't noticed that we actually _do_ set some flags already
in all-packages, just not all the old ones. Use that way instead.
This commit is contained in:
Nikolay Amiantov 2016-06-23 13:55:27 +03:00
parent 7de7a35d59
commit 9e8592d6b9
2 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/misc/emulators/wine/default.nix
View File

@ -10,26 +10,26 @@
wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
pngSupport ? true,
jpegSupport ? true,
pngSupport ? false,
jpegSupport ? false,
tiffSupport ? false,
gettextSupport ? true,
fontconfigSupport ? true,
alsaSupport ? true,
gettextSupport ? false,
fontconfigSupport ? false,
alsaSupport ? false,
gtkSupport ? false,
openglSupport ? true,
tlsSupport ? true,
openglSupport ? false,
tlsSupport ? false,
gstreamerSupport ? false,
cupsSupport ? true,
colorManagementSupport ? true,
dbusSupport ? true,
mpg123Support ? true,
openalSupport ? true,
cupsSupport ? false,
colorManagementSupport ? false,
dbusSupport ? false,
mpg123Support ? false,
openalSupport ? false,
openclSupport ? false,
cairoSupport ? true,
cairoSupport ? false,
odbcSupport ? false,
netapiSupport ? false,
cursesSupport ? true,
cursesSupport ? false,
vaSupport ? false,
pcapSupport ? false,
v4lSupport ? false,
@ -37,9 +37,9 @@
gsmSupport ? false,
gphoto2Support ? false,
ldapSupport ? false,
pulseaudioSupport ? true,
xineramaSupport ? true,
xmlSupport ? true }:
pulseaudioSupport ? false,
xineramaSupport ? false,
xmlSupport ? false }:
let wine-build = build: release:
lib.getAttr build (callPackage ./packages.nix {

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

@ -16999,10 +16999,11 @@ in
webfs = callPackage ../servers/http/webfs { };
wine = callPackage ../misc/emulators/wine {
wineMinimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable";
wineBuild = config.wine.build or "wine32";
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
};
wine = lowPrio (self.wineMinimal.override {
pngSupport = true;
jpegSupport = true;
tiffSupport = true;
@ -17011,30 +17012,21 @@ in
alsaSupport = true;
openglSupport = true;
tlsSupport = true;
cursesSupport = true;
};
wineMinimal = lowPrio (self.wine.override {
pulseaudioSupport = false;
pngSupport = false;
jpegSupport = false;
tiffSupport = false;
gettextSupport = false;
fontconfigSupport = false;
alsaSupport = false;
openglSupport = false;
tlsSupport = false;
cursesSupport = false;
});
wineFull = lowPrio (self.wine.override {
gtkSupport = true;
gstreamerSupport = true;
cupsSupport = true;
colorManagementSupport = true;
dbusSupport = true;
mpg123Support = true;
openalSupport = true;
openclSupport = true;
cairoSupport = true;
cursesSupport = true;
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
xineramaSupport = true;
xmlSupport = true;
});
wineFull = lowPrio (self.wine.override {
gtkSupport = true;
gstreamerSupport = true;
openclSupport = true;
odbcSupport = true;
netapiSupport = true;
vaSupport = true;
@ -17045,8 +17037,6 @@ in
gphoto2Support = true;
ldapSupport = true;
pulseaudioSupport = true;
xineramaSupport = true;
xmlSupport = true;
});
wineStable = self.wine.override { wineRelease = "stable"; };
wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });