2 files changed, 29 insertions, 39 deletions

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 260c02e4d1b6..deeff3c73437 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -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 {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 066c9d2c39eb..c3d061b375ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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"; });