nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

vinegar: 1.7.3 -> 1.7.4; Add childwindow patch; pinned Wine to 9.2-staging

Browse Source 
This PR adds the following:

- Updates the hash and version for vinegar
- Adds the childwindow patch (from the vinegar flatpak)
- Ping the WINE version to 9.2-staging (this is the version of WINE vinegar ships with in their flatpak)

and with this, the nix package will be the same functionally as the official Flatpak.
This commit is contained in:
Liquidovski 2024-04-18 20:26:33 +03:00 committed by GitHub
parent 5672bc9dbf
commit 03eddf9906
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pkgs/by-name/vi/vinegar/package.nix
View File

@ -10,40 +10,66 @@
, vulkan-headers , vulkan-headers
, wine64Packages , wine64Packages
, fetchpatch , fetchpatch
, fetchFromGitLab
, fetchurl
,
}: }:
let let
# wine-staging doesn't support overrideAttrs for now stagingPatch = fetchFromGitLab {
sha256 = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";
rev = "v9.2";
};
wine = wine64Packages.staging.overrideDerivation (oldAttrs: { wine = wine64Packages.staging.overrideDerivation (oldAttrs: {
patches = prePatch = ''
(oldAttrs.patches or []) patchShebangs tools
cp -r ${stagingPatch}/patches ${stagingPatch}/staging .
chmod +w patches
patchShebangs ./patches/gitapply.sh
python3 ./staging/patchinstall.py --destdir="$PWD" --all
'';
patches = (oldAttrs.patches or [ ])
++ [ ++ [
# upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 (fetchurl {
# Here are the currently applied patches for Roblox to run under WINE: name = "childwindow.patch";
(fetchpatch { hash = "sha256-u3mDvlbhQnfh2tUKb8jNJA0tTcLIaKVLfY8ktJmeRns=";
name = "vinegar-wine-segregrevert.patch"; url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/childwindow.patch";
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/segregrevert.patch"; })
hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c="; (fetchpatch {
}) name = "mouselock.patch";
(fetchpatch { hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4=";
name = "vinegar-wine-mouselock.patch"; url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/mouselock.patch";
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/mouselock.patch"; })
hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; (fetchpatch {
}) name = "segregrevert.patch";
]; hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c=";
url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/segregrevert.patch";
})
];
src = fetchFromGitLab rec {
sha256 = "sha256-GlPH34dr9aHx7xvlcbtDMn/wrY//DP58ilXjhQXgihQ=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine";
rev = "wine-9.2";
};
}); });
in in
buildGoModule rec { buildGoModule rec {
pname = "vinegar"; pname = "vinegar";
version = "1.7.3"; version = "1.7.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinegarhq"; owner = "vinegarhq";
repo = "vinegar"; repo = "vinegar";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-aKL+4jw/uMbbvLRCBHstCTrcQ1PTYSCwMNgXTvSvMeY="; hash = "sha256-4tkcrUzW8la5WiDtGUvvsRzFqZM1gqnWWAzXc82hirM=";
}; };
vendorHash = "sha256-OaMfWecOPQh6quXjYkZLyBDHZ9TINSA7Ue/Y0sz5ZYY="; vendorHash = "sha256-pi9FjKYXH8cqTx2rTRCyT4+pOM5HnIKosEcmcpbuywQ=";
nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ];