From bc3b694a39174ceed2fd711f404ff53e0f12f56a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 29 May 2020 16:02:49 +0200 Subject: [PATCH] direnv: fix missing BASH_PATH (#89165) This was broken by the switch to go modules (#87932) which doesn't respect makeFlags. Fixes #89129 --- pkgs/tools/misc/direnv/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1b6b87984c6..47668986a46 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -14,9 +14,14 @@ buildGoModule rec { }; # we have no bash at the moment for windows - makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [ - "BASH_PATH=${bash}/bin/bash" - ]; + BASH_PATH = + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + "${bash}/bin/bash"; + + # replace the build phase to use the GNUMakefile instead + buildPhase = '' + make BASH_PATH=$BASH_PATH + ''; installPhase = '' make install DESTDIR=$out