public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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", wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
pngSupport ? true, pngSupport ? false,
jpegSupport ? true, jpegSupport ? false,
tiffSupport ? false, tiffSupport ? false,
gettextSupport ? true, gettextSupport ? false,
fontconfigSupport ? true, fontconfigSupport ? false,
alsaSupport ? true, alsaSupport ? false,
gtkSupport ? false, gtkSupport ? false,
openglSupport ? true, openglSupport ? false,
tlsSupport ? true, tlsSupport ? false,
gstreamerSupport ? false, gstreamerSupport ? false,
cupsSupport ? true, cupsSupport ? false,
colorManagementSupport ? true, colorManagementSupport ? false,
dbusSupport ? true, dbusSupport ? false,
mpg123Support ? true, mpg123Support ? false,
openalSupport ? true, openalSupport ? false,
openclSupport ? false, openclSupport ? false,
cairoSupport ? true, cairoSupport ? false,
odbcSupport ? false, odbcSupport ? false,
netapiSupport ? false, netapiSupport ? false,
cursesSupport ? true, cursesSupport ? false,
vaSupport ? false, vaSupport ? false,
pcapSupport ? false, pcapSupport ? false,
v4lSupport ? false, v4lSupport ? false,
@ -37,9 +37,9 @@
gsmSupport ? false, gsmSupport ? false,
gphoto2Support ? false, gphoto2Support ? false,
ldapSupport ? false, ldapSupport ? false,
pulseaudioSupport ? true, pulseaudioSupport ? false,
xineramaSupport ? true, xineramaSupport ? false,
xmlSupport ? true }: xmlSupport ? false }:
let wine-build = build: release: let wine-build = build: release:
lib.getAttr build (callPackage ./packages.nix { 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 { }; webfs = callPackage ../servers/http/webfs { };
wine = callPackage ../misc/emulators/wine { wineMinimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable"; wineRelease = config.wine.release or "stable";
wineBuild = config.wine.build or "wine32"; wineBuild = config.wine.build or "wine32";
pulseaudioSupport = config.pulseaudio or stdenv.isLinux; };
wine = lowPrio (self.wineMinimal.override {
pngSupport = true; pngSupport = true;
jpegSupport = true; jpegSupport = true;
tiffSupport = true; tiffSupport = true;
@ -17011,30 +17012,21 @@ in
alsaSupport = true; alsaSupport = true;
openglSupport = true; openglSupport = true;
tlsSupport = 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; cupsSupport = true;
colorManagementSupport = true; colorManagementSupport = true;
dbusSupport = true; dbusSupport = true;
mpg123Support = true; mpg123Support = true;
openalSupport = true; openalSupport = true;
openclSupport = true;
cairoSupport = 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; odbcSupport = true;
netapiSupport = true; netapiSupport = true;
vaSupport = true; vaSupport = true;
@ -17045,8 +17037,6 @@ in
gphoto2Support = true; gphoto2Support = true;
ldapSupport = true; ldapSupport = true;
pulseaudioSupport = true; pulseaudioSupport = true;
xineramaSupport = true;
xmlSupport = true;
}); });
wineStable = self.wine.override { wineRelease = "stable"; }; wineStable = self.wine.override { wineRelease = "stable"; };
wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; }); wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });