colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #276396 from nyabinary/vinegar-1.6.0

Browse Source 
vinegar: 1.5.9 -> 1.6.0
This commit is contained in:
Guillaume Girol 2023-12-31 15:04:03 +01:00 committed by GitHub
commit d7db3ee91f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,21 @@
{ { lib
lib, , buildGoModule
buildGoModule, , fetchFromGitHub
fetchFromGitHub, , makeBinaryWrapper
makeBinaryWrapper, , pkg-config
pkg-config, , libGL
libGL, , libxkbcommon
libxkbcommon, , xorg
xorg, , wayland
wineWowPackages, , vulkan-headers
fetchpatch, , wineWowPackages
}: let , fetchpatch
}:
let
# wine-staging doesn't support overrideAttrs for now # wine-staging doesn't support overrideAttrs for now
wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: { wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: {
patches = patches =
(oldAttrs.patches or []) (oldAttrs.patches or [ ])
++ [ ++ [
# upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 # upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604
# Here are the currently applied patches for Roblox to run under WINE: # Here are the currently applied patches for Roblox to run under WINE:
@ -25,46 +27,46 @@
]; ];
}); });
in in
buildGoModule rec { buildGoModule rec {
pname = "vinegar"; pname = "vinegar";
version = "1.5.9"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinegarhq"; owner = "vinegarhq";
repo = "vinegar"; repo = "vinegar";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-cLzQnNmQYyAIdTGygk/CNU/mxGgcgoFTg5G/0DNwpz4="; hash = "sha256-TebRAqMPrXSSKg05iX3Y/S0uACePOR/QNnNcOOMw+Xk=";
}; };
vendorHash = "sha256-DZI4APnrldnwOmLZ9ucFBGQDxzPXTIi44eLu74WrSBI="; vendorHash = "sha256-Ex6PRd3rD2jbLXlY36koNvZF3P+gAZTE9hExIfOw9CE=";
nativeBuildInputs = [pkg-config makeBinaryWrapper]; nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
buildInputs = [libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine]; buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
make PREFIX=$out make PREFIX=$out
runHook postBuild runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
make PREFIX=$out install make PREFIX=$out install
runHook postInstall runHook postInstall
''; '';
postInstall = '' postInstall = ''
wrapProgram $out/bin/vinegar \ wrapProgram $out/bin/vinegar \
--prefix PATH : ${lib.makeBinPath [wine]} --prefix PATH : ${lib.makeBinPath [wine]}
''; '';
meta = with lib; { meta = with lib; {
description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux";
homepage = "https://github.com/vinegarhq/vinegar"; homepage = "https://github.com/vinegarhq/vinegar";
changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}";
mainProgram = "vinegar"; mainProgram = "vinegar";
license = licenses.gpl3Only; license = licenses.gpl3Only;
platforms = ["x86_64-linux" "i686-linux"]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [nyanbinary]; maintainers = with maintainers; [ nyanbinary ];
}; };
} }