From 1b2b126f82b5b8796ac90a22939cbe1449647a1b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 17 May 2018 02:29:26 +0300 Subject: [PATCH] winePackages: move to pkgs/top-level/wine-packages.nix --- pkgs/top-level/all-packages.nix | 49 +------------------------------ pkgs/top-level/wine-packages.nix | 50 ++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 48 deletions(-) create mode 100644 pkgs/top-level/wine-packages.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ef39d5c6eb..e7b3c1d39085 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21209,54 +21209,7 @@ with pkgs; pythonPackages = python3Packages; }; - winePackages = recurseIntoAttrs 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; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix new file mode 100644 index 000000000000..109f01362555 --- /dev/null +++ b/pkgs/top-level/wine-packages.nix @@ -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"; }; +}