diff options
author | Guillaume Girol <symphorien@users.noreply.github.com> | 2023-12-31 15:04:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-31 15:04:03 +0100 |
commit | d7db3ee91f222d1b40435ae96d38e072c582f683 (patch) | |
tree | 9b5343a73fdf395e299a41d9c6531ef94406405a | |
parent | aec0531dee9355196581afe4dcca4a33872fcb87 (diff) | |
parent | e5ab70f4eea46d7580edfe8027797cb990e33312 (diff) |
Merge pull request #276396 from nyabinary/vinegar-1.6.0
vinegar: 1.5.9 -> 1.6.0
-rw-r--r-- | pkgs/by-name/vi/vinegar/package.nix | 100 |
1 files changed, 51 insertions, 49 deletions
diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index bee2a13d50272..fb34f2e79d569 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -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 ]; + }; +} |