From d4f59b601f38106454a4b7e59e8ceabcdabc9724 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 2 May 2025 09:46:06 -0300 Subject: [PATCH 1/2] vinegar: use finalAttrs --- pkgs/by-name/vi/vinegar/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 8a6bb7daf1fc..63351c4c8787 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -53,14 +53,14 @@ let ]; }); in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "vinegar"; version = "1.8.1"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7rc6LKZx0OOZDedtTpHIQT4grx1FejRiVnJnVDUddy4="; }; @@ -133,7 +133,7 @@ buildGoModule rec { winetricks ] } \ - --prefix PUREGOTK_LIB_FOLDER : ${passthru.libraryPath}/lib + --prefix PUREGOTK_LIB_FOLDER : ${finalAttrs.passthru.libraryPath}/lib ''; passthru = { @@ -155,7 +155,7 @@ buildGoModule rec { }; meta = { - changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; + changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${finalAttrs.version}"; description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox Studio on Linux"; homepage = "https://github.com/vinegarhq/vinegar"; license = lib.licenses.gpl3Only; @@ -164,4 +164,4 @@ buildGoModule rec { platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; -} +}) From ebe9d746a2499b7415565a19835475938371c895 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 2 May 2025 09:46:24 -0300 Subject: [PATCH 2/2] vinegar: fix missing wine binary from PATH wine64 binary is not available on the latest versions of wine64 staging, but vinegar still looks for it --- pkgs/by-name/vi/vinegar/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 63351c4c8787..f0b229ce690d 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -51,6 +51,10 @@ let hash = "sha256-89wnr2rIbyw490hHwckB9g1GKCXm6BERnplfwEUlNOg="; }) ]; + + postInstall = '' + cp $out/bin/wine $out/bin/wine64 + ''; }); in buildGoModule (finalAttrs: {