From 6f1dbeb35f4d828dbfc3baf9db5af61812ff42cd Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 27 Apr 2022 17:10:05 -0700 Subject: [PATCH] dante: remove hardwired PATH= from redefgen.sh script Let's remove the hardwired PATH= setting from the redefgen.sh script which is executed when autoreconfHook is enabled. This resolves the following failure: build flags: SHELL=/nix/store/i2k8pqqzrmaafz2lf1dly1w96n4xpf2w-bash-5.1-p16/bin/bash Making all in include make[1]: Entering directory '/build/dante-1.4.3/include' make all-am make[2]: Entering directory '/build/dante-1.4.3/include' sh ../include/redefgen.sh ../include ../include/redefgen.sh: line 13: egrep: command not found ../include/redefgen.sh: line 13: egrep: command not found ../include/redefgen.sh: line 13: awk: command not found --- pkgs/servers/dante/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 12ba281d811..dd5967a2407 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y="; }) ]; + postPatch = '' + substituteInPlace include/redefgen.sh --replace 'PATH=/bin:/usr/bin:/sbin:/usr/sbin' "" + ''; + meta = with lib; { description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity"; homepage = "https://www.inet.no/dante/";