From 550e3ff156ae16e4e0a57014db3bbf67e22bb43c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 25 Sep 2022 00:49:29 +0200 Subject: [PATCH] wp4nix: Use makeWrapper instead of patching --- pkgs/development/tools/wp4nix/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/development/tools/wp4nix/default.nix index 967459e91b74..a97ae7737064 100644 --- a/pkgs/development/tools/wp4nix/default.nix +++ b/pkgs/development/tools/wp4nix/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitLab, nix, subversion }: +{ lib +, buildGoModule +, fetchFromGitLab +, nix +, subversion +, makeWrapper +}: buildGoModule rec { pname = "wp4nix"; @@ -14,9 +20,13 @@ buildGoModule rec { vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - postPatch = '' - substituteInPlace main.go --replace nix-hash ${nix}/bin/nix-hash - substituteInPlace svn.go --replace '"svn"' '"${subversion}/bin/svn"' + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/wp4nix \ + --prefix PATH : ${lib.makeBinPath [ nix subversion ]} ''; meta = with lib; {