lol

wine: set default features in all-packages

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.

+29 -39
+17 -17
pkgs/misc/emulators/wine/default.nix
··· 10 10 wineRelease ? "stable", 11 11 wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), 12 12 libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", 13 - pngSupport ? true, 14 - jpegSupport ? true, 13 + pngSupport ? false, 14 + jpegSupport ? false, 15 15 tiffSupport ? false, 16 - gettextSupport ? true, 17 - fontconfigSupport ? true, 18 - alsaSupport ? true, 16 + gettextSupport ? false, 17 + fontconfigSupport ? false, 18 + alsaSupport ? false, 19 19 gtkSupport ? false, 20 - openglSupport ? true, 21 - tlsSupport ? true, 20 + openglSupport ? false, 21 + tlsSupport ? false, 22 22 gstreamerSupport ? false, 23 - cupsSupport ? true, 24 - colorManagementSupport ? true, 25 - dbusSupport ? true, 26 - mpg123Support ? true, 27 - openalSupport ? true, 23 + cupsSupport ? false, 24 + colorManagementSupport ? false, 25 + dbusSupport ? false, 26 + mpg123Support ? false, 27 + openalSupport ? false, 28 28 openclSupport ? false, 29 - cairoSupport ? true, 29 + cairoSupport ? false, 30 30 odbcSupport ? false, 31 31 netapiSupport ? false, 32 - cursesSupport ? true, 32 + cursesSupport ? false, 33 33 vaSupport ? false, 34 34 pcapSupport ? false, 35 35 v4lSupport ? false, ··· 37 37 gsmSupport ? false, 38 38 gphoto2Support ? false, 39 39 ldapSupport ? false, 40 - pulseaudioSupport ? true, 41 - xineramaSupport ? true, 42 - xmlSupport ? true }: 40 + pulseaudioSupport ? false, 41 + xineramaSupport ? false, 42 + xmlSupport ? false }: 43 43 44 44 let wine-build = build: release: 45 45 lib.getAttr build (callPackage ./packages.nix {
+12 -22
pkgs/top-level/all-packages.nix
··· 16999 16999 17000 17000 webfs = callPackage ../servers/http/webfs { }; 17001 17001 17002 - wine = callPackage ../misc/emulators/wine { 17002 + wineMinimal = callPackage ../misc/emulators/wine { 17003 17003 wineRelease = config.wine.release or "stable"; 17004 17004 wineBuild = config.wine.build or "wine32"; 17005 - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; 17005 + }; 17006 + wine = lowPrio (self.wineMinimal.override { 17006 17007 pngSupport = true; 17007 17008 jpegSupport = true; 17008 17009 tiffSupport = true; ··· 17011 17012 alsaSupport = true; 17012 17013 openglSupport = true; 17013 17014 tlsSupport = true; 17014 - cursesSupport = true; 17015 - }; 17016 - wineMinimal = lowPrio (self.wine.override { 17017 - pulseaudioSupport = false; 17018 - pngSupport = false; 17019 - jpegSupport = false; 17020 - tiffSupport = false; 17021 - gettextSupport = false; 17022 - fontconfigSupport = false; 17023 - alsaSupport = false; 17024 - openglSupport = false; 17025 - tlsSupport = false; 17026 - cursesSupport = false; 17027 - }); 17028 - wineFull = lowPrio (self.wine.override { 17029 - gtkSupport = true; 17030 - gstreamerSupport = true; 17031 17015 cupsSupport = true; 17032 17016 colorManagementSupport = true; 17033 17017 dbusSupport = true; 17034 17018 mpg123Support = true; 17035 17019 openalSupport = true; 17020 + cairoSupport = true; 17021 + cursesSupport = true; 17022 + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; 17023 + xineramaSupport = true; 17024 + xmlSupport = true; 17025 + }); 17026 + wineFull = lowPrio (self.wine.override { 17027 + gtkSupport = true; 17028 + gstreamerSupport = true; 17036 17029 openclSupport = true; 17037 - cairoSupport = true; 17038 17030 odbcSupport = true; 17039 17031 netapiSupport = true; 17040 17032 vaSupport = true; ··· 17045 17037 gphoto2Support = true; 17046 17038 ldapSupport = true; 17047 17039 pulseaudioSupport = true; 17048 - xineramaSupport = true; 17049 - xmlSupport = true; 17050 17040 }); 17051 17041 wineStable = self.wine.override { wineRelease = "stable"; }; 17052 17042 wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });