From b89514eced6d32203982c54e0ad8c2f83dbca900 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Dec 2015 15:04:14 +0100 Subject: [PATCH] fetchgit: follow up to 2cf7069b7da368326b51520536ac0f1020157f7a If "fetcher" is a string, then Nix will execute it with bash already, so the additional bash argument in that string was redundant and apparently causes trouble on non-Linux platforms. Hopefully fixes https://github.com/NixOS/nixpkgs/issues/11496. --- pkgs/build-support/fetchgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index c73ee193519..127693d42f2 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -45,7 +45,7 @@ assert deepClone -> leaveDotGit; stdenv.mkDerivation { inherit name; builder = ./builder.sh; - fetcher = "${stdenv.shell} ${./nix-prefetch-git}"; + fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. buildInputs = [git]; outputHashAlgo = if sha256 == "" then "md5" else "sha256";