public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10696 from 'bendlas-update-wine'

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-11-15 16:07:31 +03:00
commit 703aaa6e89
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/misc/emulators/wine/default.nix
View File

@ -6,17 +6,20 @@
# }; # };
# Make additional configurations on demand: # Make additional configurations on demand:
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; # wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
{ lib, pkgs, system, callPackage, wineUnstable, { lib, pkgs, system, callPackage,
wineRelease ? "stable", wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }: 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 { callPackage ./staging.nix {
inherit libtxc_dxtn_Name; inherit libtxc_dxtn_Name;
wine = wineUnstable; wineUnstable = wine-build wineBuild "unstable";
} }
else else
lib.getAttr wineBuild (callPackage ./packages.nix { wine-build wineBuild wineRelease
inherit wineRelease;
})

8
pkgs/misc/emulators/wine/staging.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, lib, fetchFromGitHub, wine, libtxc_dxtn_Name }: { stdenv, callPackage, lib, fetchFromGitHub, wineUnstable, libtxc_dxtn_Name }:
with callPackage ./util.nix {}; with callPackage ./util.nix {};
@ -11,10 +11,10 @@ let v = (import ./versions.nix).staging;
rev = "v${version}"; rev = "v${version}";
}; };
build-inputs = pkgNames: extra: build-inputs = pkgNames: extra:
(mkBuildInputs wine.pkgArches pkgNames) ++ extra; (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
in assert (builtins.parseDrvName wine.name).version == version; 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; nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs;
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;

8
pkgs/misc/emulators/wine/versions.nix
View File

@ -1,7 +1,7 @@
{ {
unstable = { unstable = {
wineVersion = "1.7.52"; wineVersion = "1.7.53";
wineSha256 = "0jsm1p7zwhfb5fpp0xd39vnx9m98kqgfng1q9kdj70rm1hmb6wq7"; wineSha256 = "18y6q8nc3z3si75qjdhs57y8y3wh7pgl47sb1ajq7rnd0sqp1fpg";
geckoVersion = "2.36"; geckoVersion = "2.36";
geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
gecko64Version = "2.36"; gecko64Version = "2.36";
@ -20,8 +20,8 @@
monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
}; };
staging = { staging = {
version = "1.7.52"; version = "1.7.53";
sha256 = "12r100gv34k44kia14wrfa42q0cjd8ir8vi8cx1b6hgnzw3x0gzk"; sha256 = "1p1vqvs5imc8yfcznj55zb29fq2q3qzr7ms1h54ck70hgwpyki1c";
}; };
winetricks = { winetricks = {
version = "20151110"; version = "20151110";