diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-07-14 16:35:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 16:35:23 -0400 |
| commit | a4c7c2ab302042251aed5bba20b8c435d55fea21 (patch) | |
| tree | 02777911dc28793553a03838e1e71279855890c7 /pkgs/misc/emulators | |
| parent | a794977af3295558b022a28af34a5b1c200c1553 (diff) | |
| parent | ec7b6af024092a6485bde6d866e8c60d8ef453fd (diff) | |
| download | nixlib-a4c7c2ab302042251aed5bba20b8c435d55fea21.tar nixlib-a4c7c2ab302042251aed5bba20b8c435d55fea21.tar.gz nixlib-a4c7c2ab302042251aed5bba20b8c435d55fea21.tar.bz2 nixlib-a4c7c2ab302042251aed5bba20b8c435d55fea21.tar.lz nixlib-a4c7c2ab302042251aed5bba20b8c435d55fea21.tar.xz nixlib-a4c7c2ab302042251aed5bba20b8c435d55fea21.tar.zst nixlib-a4c7c2ab302042251aed5bba20b8c435d55fea21.zip | |
Merge pull request #92295 from avnik/wine-update
Wine update: 5.11 -> 5.12
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 9 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/staging.nix | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index ffad1e3c9907..d30d4bcdc1c2 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,19 +39,22 @@ in rec { unstable = fetchurl rec { # 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"; - sha256 = "1q0sh89xnn6cq3kpqrrq9h316qyzpslj2w6m6vq7pq4y4p727nxk"; + sha256 = "0bl4ii4h1w4z8kb6dpdc1pgwk0wrhm61c2q2nzpcckkrqra75wc7"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "050npck8mdck8m2rs9xn6mszzj2fv9ql80g08j2ahinf792svrid"; + sha256 = "1f6ay0khdcxxnsvp4rywg80qpcysbplyrq7qjmqjvdysi7k2wm1w"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; + + # Just keep list empty, if current release haven't broken patchsets + disabledPatchsets = [ "xactengine-initial" ]; }; winetricks = fetchFromGitHub rec { diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 48ea93a97a8e..f3b9fa304204 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert stdenv.lib.getVersion wineUnstable == patch.version; (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"; @@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version; chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$PWD/.." --all + ./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} cd .. ''; })) // { |