pyrox.dev
lol
Merge pull request #274542 from ardishco-the-great/patch-9
vinegar: add segrevert patch for wine 9.0-rc1-staging
authored by
Lily Foster
and committed by
GitHub
64006f04
093f742f
+63
-47
+63
-47
pkgs/by-name/vi/vinegar/package.nix
+63
-47
pkgs/by-name/vi/vinegar/package.nix
···
1
-
{ lib
2
-
, buildGoModule
3
-
, fetchFromGitHub
4
-
, wine-staging
5
-
, makeBinaryWrapper
6
-
, pkg-config
7
-
, libGL
8
-
, libxkbcommon
9
-
, xorg
10
-
}:
1
+
{
2
+
lib,
3
+
buildGoModule,
4
+
fetchFromGitHub,
5
+
makeBinaryWrapper,
6
+
pkg-config,
7
+
libGL,
8
+
libxkbcommon,
9
+
xorg,
10
+
wineWowPackages,
11
+
fetchpatch,
12
+
}: let
13
+
# wine-staging doesn't support overrideAttrs for now
14
+
wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: {
15
+
patches =
16
+
(oldAttrs.patches or [])
17
+
++ [
18
+
# upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604
19
+
# Here are the currently applied patches for Roblox to run under WINE:
20
+
(fetchpatch {
21
+
name = "vinegar-wine-segrevert.patch";
22
+
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/8fc153c492542a522d6cc2dff7d1af0e030a529a/patches/wine/temp.patch";
23
+
hash = "sha256-AnEBBhB8leKP0xCSr6UsQK7CN0NDbwqhe326tJ9dDjc=";
24
+
})
25
+
];
26
+
});
27
+
in
28
+
buildGoModule rec {
29
+
pname = "vinegar";
30
+
version = "1.5.9";
11
31
12
-
buildGoModule rec {
13
-
pname = "vinegar";
14
-
version = "1.5.9";
15
-
16
-
src = fetchFromGitHub {
17
-
owner = "vinegarhq";
18
-
repo = "vinegar";
19
-
rev = "v${version}";
20
-
hash = "sha256-cLzQnNmQYyAIdTGygk/CNU/mxGgcgoFTg5G/0DNwpz4=";
21
-
};
32
+
src = fetchFromGitHub {
33
+
owner = "vinegarhq";
34
+
repo = "vinegar";
35
+
rev = "v${version}";
36
+
hash = "sha256-cLzQnNmQYyAIdTGygk/CNU/mxGgcgoFTg5G/0DNwpz4=";
37
+
};
22
38
23
-
vendorHash = "sha256-DZI4APnrldnwOmLZ9ucFBGQDxzPXTIi44eLu74WrSBI=";
39
+
vendorHash = "sha256-DZI4APnrldnwOmLZ9ucFBGQDxzPXTIi44eLu74WrSBI=";
24
40
25
-
nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
26
-
buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine-staging ];
41
+
nativeBuildInputs = [pkg-config makeBinaryWrapper];
42
+
buildInputs = [libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine];
27
43
28
-
buildPhase = ''
29
-
runHook preBuild
30
-
make PREFIX=$out
31
-
runHook postBuild
32
-
'';
44
+
buildPhase = ''
45
+
runHook preBuild
46
+
make PREFIX=$out
47
+
runHook postBuild
48
+
'';
33
49
34
-
installPhase = ''
35
-
runHook preInstall
36
-
make PREFIX=$out install
37
-
runHook postInstall
38
-
'';
50
+
installPhase = ''
51
+
runHook preInstall
52
+
make PREFIX=$out install
53
+
runHook postInstall
54
+
'';
39
55
40
-
postInstall = ''
41
-
wrapProgram $out/bin/vinegar \
42
-
--prefix PATH : ${lib.makeBinPath [ wine-staging ]}
43
-
'';
56
+
postInstall = ''
57
+
wrapProgram $out/bin/vinegar \
58
+
--prefix PATH : ${lib.makeBinPath [wine]}
59
+
'';
44
60
45
-
meta = with lib; {
46
-
description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux";
47
-
homepage = "https://github.com/vinegarhq/vinegar";
48
-
changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}";
49
-
mainProgram = "vinegar";
50
-
license = licenses.gpl3Only;
51
-
platforms = [ "x86_64-linux" "i686-linux" ];
52
-
maintainers = with maintainers; [ nyanbinary ];
53
-
};
54
-
}
61
+
meta = with lib; {
62
+
description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux";
63
+
homepage = "https://github.com/vinegarhq/vinegar";
64
+
changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}";
65
+
mainProgram = "vinegar";
66
+
license = licenses.gpl3Only;
67
+
platforms = ["x86_64-linux" "i686-linux"];
68
+
maintainers = with maintainers; [nyanbinary];
69
+
};
70
+
}