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,
buildGoModule,
fetchFromGitHub,
makeBinaryWrapper,
pkg-config,
libGL,
libxkbcommon,
xorg,
wineWowPackages,
fetchpatch,
}: let
{ lib
, buildGoModule
, fetchFromGitHub
, makeBinaryWrapper
, pkg-config
, libGL
, libxkbcommon
, xorg
, wayland
, vulkan-headers
, wineWowPackages
, fetchpatch
}:
let
# wine-staging doesn't support overrideAttrs for now
wine = wineWowPackages.stagingFull.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:
@ -25,46 +27,46 @@
];
});
in
buildGoModule rec {
pname = "vinegar";
version = "1.5.9";
buildGoModule rec {
pname = "vinegar";
version = "1.6.0";
src = fetchFromGitHub {
owner = "vinegarhq";
repo = "vinegar";
rev = "v${version}";
hash = "sha256-cLzQnNmQYyAIdTGygk/CNU/mxGgcgoFTg5G/0DNwpz4=";
};
src = fetchFromGitHub {
owner = "vinegarhq";
repo = "vinegar";
rev = "v${version}";
hash = "sha256-TebRAqMPrXSSKg05iX3Y/S0uACePOR/QNnNcOOMw+Xk=";
};
vendorHash = "sha256-DZI4APnrldnwOmLZ9ucFBGQDxzPXTIi44eLu74WrSBI=";
vendorHash = "sha256-Ex6PRd3rD2jbLXlY36koNvZF3P+gAZTE9hExIfOw9CE=";
nativeBuildInputs = [pkg-config makeBinaryWrapper];
buildInputs = [libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine];
nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ];
buildPhase = ''
runHook preBuild
make PREFIX=$out
runHook postBuild
'';
buildPhase = ''
runHook preBuild
make PREFIX=$out
runHook postBuild
'';
installPhase = ''
runHook preInstall
make PREFIX=$out install
runHook postInstall
'';
installPhase = ''
runHook preInstall
make PREFIX=$out install
runHook postInstall
'';
postInstall = ''
wrapProgram $out/bin/vinegar \
--prefix PATH : ${lib.makeBinPath [wine]}
'';
postInstall = ''
wrapProgram $out/bin/vinegar \
--prefix PATH : ${lib.makeBinPath [wine]}
'';
meta = with lib; {
description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux";
homepage = "https://github.com/vinegarhq/vinegar";
changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}";
mainProgram = "vinegar";
license = licenses.gpl3Only;
platforms = ["x86_64-linux" "i686-linux"];
maintainers = with maintainers; [nyanbinary];
};
}
meta = with lib; {
description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux";
homepage = "https://github.com/vinegarhq/vinegar";
changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}";
mainProgram = "vinegar";
license = licenses.gpl3Only;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nyanbinary ];
};
}