Merge pull request #289265 from liquidovski/patch-9

vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.4
This commit is contained in:
kirillrdy 2024-02-26 06:33:18 +11:00 committed by GitHub
commit b3b5399edb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -8,37 +8,42 @@
, xorg
, wayland
, vulkan-headers
, wineWowPackages
, wine64Packages
, fetchpatch
}:
let
# wine-staging doesn't support overrideAttrs for now
wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: {
wine = wine64Packages.staging.overrideDerivation (oldAttrs: {
patches =
(oldAttrs.patches or [ ])
(oldAttrs.patches or [])
++ [
# upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604
# Here are the currently applied patches for Roblox to run under WINE:
(fetchpatch {
name = "vinegar-wine-segrevert.patch";
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/8fc153c492542a522d6cc2dff7d1af0e030a529a/patches/wine/temp.patch";
hash = "sha256-AnEBBhB8leKP0xCSr6UsQK7CN0NDbwqhe326tJ9dDjc=";
name = "vinegar-wine-segregrevert.patch";
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/segregrevert.patch";
hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c=";
})
(fetchpatch {
name = "vinegar-wine-mouselock.patch";
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/mouselock.patch";
hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4=";
})
];
});
in
buildGoModule rec {
pname = "vinegar";
version = "1.6.1";
version = "1.7.3";
src = fetchFromGitHub {
owner = "vinegarhq";
repo = "vinegar";
rev = "v${version}";
hash = "sha256-uRdWE5NwRVSuUZyU5B5u5DfJOxu/gUqwM682eORTDOs=";
hash = "sha256-aKL+4jw/uMbbvLRCBHstCTrcQ1PTYSCwMNgXTvSvMeY=";
};
vendorHash = "sha256-Ex6PRd3rD2jbLXlY36koNvZF3P+gAZTE9hExIfOw9CE=";
vendorHash = "sha256-OaMfWecOPQh6quXjYkZLyBDHZ9TINSA7Ue/Y0sz5ZYY=";
nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ];