wine: fix infinite recursion in wine-staging build

2 files changed, 13 insertions, 10 deletions

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index e2e85e7d8dab..5261f79de107 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -6,17 +6,20 @@
 # };
 # Make additional configurations on demand:
 # wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
-{ lib, pkgs, system, callPackage, wineUnstable,
+{ lib, pkgs, system, callPackage,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
 
-if wineRelease == "staging" then
+let wine-build = build: release:
+      lib.getAttr build (callPackage ./packages.nix {
+        wineRelease = release;
+      });
+
+in if wineRelease == "staging" then
   callPackage ./staging.nix {
     inherit libtxc_dxtn_Name;
-    wine = wineUnstable;
+    wineUnstable = wine-build wineBuild "unstable";
   }
 else
-  lib.getAttr wineBuild (callPackage ./packages.nix {
-    inherit wineRelease;
-  })
+  wine-build wineBuild wineRelease
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 1de37f56504b..93e2e6fd1800 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, lib, fetchFromGitHub, wine, libtxc_dxtn_Name }:
+{ stdenv, callPackage, lib, fetchFromGitHub, wineUnstable, libtxc_dxtn_Name }:
 
 with callPackage ./util.nix {};
 
@@ -11,10 +11,10 @@ let v = (import ./versions.nix).staging;
       rev = "v${version}";
     };
     build-inputs = pkgNames: extra:
-      (mkBuildInputs wine.pkgArches pkgNames) ++ extra;
-in assert (builtins.parseDrvName wine.name).version == version;
+      (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
+in assert (builtins.parseDrvName wineUnstable.name).version == version;
 
-stdenv.lib.overrideDerivation wine (self: {
+stdenv.lib.overrideDerivation wineUnstable (self: {
   nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
   buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;