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; diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index 697183db3b73..b939e6d2f50b 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -1,7 +1,7 @@ { unstable = { - wineVersion = "1.7.52"; - wineSha256 = "0jsm1p7zwhfb5fpp0xd39vnx9m98kqgfng1q9kdj70rm1hmb6wq7"; + wineVersion = "1.7.53"; + wineSha256 = "18y6q8nc3z3si75qjdhs57y8y3wh7pgl47sb1ajq7rnd0sqp1fpg"; geckoVersion = "2.36"; geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; gecko64Version = "2.36"; @@ -20,8 +20,8 @@ monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; }; staging = { - version = "1.7.52"; - sha256 = "12r100gv34k44kia14wrfa42q0cjd8ir8vi8cx1b6hgnzw3x0gzk"; + version = "1.7.53"; + sha256 = "1p1vqvs5imc8yfcznj55zb29fq2q3qzr7ms1h54ck70hgwpyki1c"; }; winetricks = { version = "20151110";