Merge pull request #92295 from avnik/wine-update
Wine update: 5.11 -> 5.12
This commit is contained in:
commit
a4c7c2ab30
|
@ -3,14 +3,14 @@
|
||||||
#TODO: tests
|
#TODO: tests
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "faudio";
|
pname = "faudio";
|
||||||
version = "20.06";
|
version = "20.07";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "FNA-XNA";
|
owner = "FNA-XNA";
|
||||||
repo = "FAudio";
|
repo = "FAudio";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1dyx9l7ldhlbb77ca3wk0l218589blvh78mdfyzpk9k1izk2yih1";
|
sha256 = "14fi0jwax9qzn2k89qazdkhxvklk5zcwhbi6pxi1l5i9zk4ly2h7";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [cmake];
|
nativeBuildInputs = [cmake];
|
||||||
|
|
|
@ -39,19 +39,22 @@ in rec {
|
||||||
|
|
||||||
unstable = fetchurl rec {
|
unstable = fetchurl rec {
|
||||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||||
version = "5.11";
|
version = "5.12";
|
||||||
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
|
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
|
||||||
sha256 = "1q0sh89xnn6cq3kpqrrq9h316qyzpslj2w6m6vq7pq4y4p727nxk";
|
sha256 = "0bl4ii4h1w4z8kb6dpdc1pgwk0wrhm61c2q2nzpcckkrqra75wc7";
|
||||||
inherit (stable) mono gecko32 gecko64;
|
inherit (stable) mono gecko32 gecko64;
|
||||||
};
|
};
|
||||||
|
|
||||||
staging = fetchFromGitHub rec {
|
staging = fetchFromGitHub rec {
|
||||||
# https://github.com/wine-staging/wine-staging/releases
|
# https://github.com/wine-staging/wine-staging/releases
|
||||||
inherit (unstable) version;
|
inherit (unstable) version;
|
||||||
sha256 = "050npck8mdck8m2rs9xn6mszzj2fv9ql80g08j2ahinf792svrid";
|
sha256 = "1f6ay0khdcxxnsvp4rywg80qpcysbplyrq7qjmqjvdysi7k2wm1w";
|
||||||
owner = "wine-staging";
|
owner = "wine-staging";
|
||||||
repo = "wine-staging";
|
repo = "wine-staging";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
||||||
|
# Just keep list empty, if current release haven't broken patchsets
|
||||||
|
disabledPatchsets = [ "xactengine-initial" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
winetricks = fetchFromGitHub rec {
|
winetricks = fetchFromGitHub rec {
|
||||||
|
|
|
@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging;
|
||||||
in assert stdenv.lib.getVersion wineUnstable == patch.version;
|
in assert stdenv.lib.getVersion wineUnstable == patch.version;
|
||||||
|
|
||||||
(stdenv.lib.overrideDerivation wineUnstable (self: {
|
(stdenv.lib.overrideDerivation wineUnstable (self: {
|
||||||
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
|
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" "gitMinimal" ] self.buildInputs;
|
||||||
|
|
||||||
name = "${self.name}-staging";
|
name = "${self.name}-staging";
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version;
|
||||||
chmod +w patches
|
chmod +w patches
|
||||||
cd patches
|
cd patches
|
||||||
patchShebangs gitapply.sh
|
patchShebangs gitapply.sh
|
||||||
./patchinstall.sh DESTDIR="$PWD/.." --all
|
./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
|
||||||
cd ..
|
cd ..
|
||||||
'';
|
'';
|
||||||
})) // {
|
})) // {
|
||||||
|
|
Loading…
Reference in a new issue