From 301789b473c2dc357c05ebee412daa7fb24d12bc Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 3 Jul 2018 21:26:34 +0300 Subject: [PATCH] wine: build wineWow packages on hydra --- pkgs/top-level/all-packages.nix | 12 +++++++++++- pkgs/top-level/wine-packages.nix | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7..ee149a96e73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21596,7 +21596,17 @@ with pkgs; pythonPackages = python3Packages; }; - winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { }); + winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { + callPackage = newScope self; + + inherit wineBuild; + + inherit (callPackage ./wine-packages.nix {}) + minimal base full stable unstable staging; + }); + + winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); + wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow"); wine = winePackages.full; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 109f0136255..8ff2d46c24e 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,9 +1,9 @@ -{ stdenv, config, callPackage }: +{ stdenv, config, callPackage, wineBuild }: rec { minimal = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; - wineBuild = config.wine.build or "wine32"; + inherit wineBuild; }; base = minimal.override {