Skip to content

Commit 93f6cd5

Browse files
committed
vinegar: switched Wine version to wine64Packages.staging, added
segregrevert patch, added mouselock patch, added wine-loader-prefer-winedllpath.patch, bumped vinegar version from 1.6.1 --> 1.7.3 and removed patches folder
1 parent 2e4fb1a commit 93f6cd5

File tree

2 files changed

+21
-356
lines changed

2 files changed

+21
-356
lines changed

pkgs/by-name/vi/vinegar/package.nix

+21-6
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,45 @@
99
, wayland
1010
, vulkan-headers
1111
, wine64Packages
12+
, fetchpatch
1213
}:
1314
let
14-
wine = wine64Packages.stable.overrideDerivation (oldAttrs: {
15+
wine = wine64Packages.staging.overrideDerivation (oldAttrs: {
1516
patches =
16-
(oldAttrs.patches or [ ])
17+
(oldAttrs.patches or [])
1718
++ [
1819
# upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604
1920
# Here are the currently applied patches for Roblox to run under WINE:
20-
./patches/segregrevert.mypatch
21+
(fetchpatch {
22+
name = "vinegar-wine-segregrevert.patch";
23+
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/segregrevert.patch";
24+
hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c=";
25+
})
26+
(fetchpatch {
27+
name = "vinegar-wine-mouselock.patch";
28+
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/mouselock.patch";
29+
hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4=";
30+
})
31+
(fetchpatch {
32+
name = "vinegar-wine-loader-prefer-winedllpath.patch";
33+
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/loader-prefer-winedllpath.patch";
34+
hash = "sha256-KscGMMSmjnQEBjNSHECw9VCX2H6z7fKxrqxEfElGwJQ=";
35+
})
2136
];
2237
});
2338
in
2439
buildGoModule rec {
2540
pname = "vinegar";
26-
version = "1.6.1";
41+
version = "1.7.3";
2742

2843
src = fetchFromGitHub {
2944
owner = "vinegarhq";
3045
repo = "vinegar";
3146
rev = "v${version}";
32-
hash = "sha256-uRdWE5NwRVSuUZyU5B5u5DfJOxu/gUqwM682eORTDOs=";
47+
hash = "sha256-aKL+4jw/uMbbvLRCBHstCTrcQ1PTYSCwMNgXTvSvMeY=";
3348
};
3449

35-
vendorHash = "sha256-Ex6PRd3rD2jbLXlY36koNvZF3P+gAZTE9hExIfOw9CE=";
50+
vendorHash = "sha256-OaMfWecOPQh6quXjYkZLyBDHZ9TINSA7Ue/Y0sz5ZYY=";
3651

3752
nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
3853
buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ];

0 commit comments

Comments
 (0)