diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-09 18:38:19 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-10 11:18:44 -0500 |
commit | 940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e (patch) | |
tree | 1ab7a3b8c26a2a93b442c14a43495f49664c1df2 /pkgs/build-support/fetchgit/default.nix | |
parent | 7a3a8b852943d400b08ecd28c8392a0b90e79342 (diff) | |
download | nixpkgs-940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e.tar nixpkgs-940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e.tar.gz nixpkgs-940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e.tar.bz2 nixpkgs-940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e.tar.lz nixpkgs-940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e.tar.xz nixpkgs-940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e.tar.zst nixpkgs-940c4fa3f5c44453f6aaa7eca4ad2f1551a1e21e.zip |
treewide: Fetchers should use `stdenvNoCC`.
Diffstat (limited to 'pkgs/build-support/fetchgit/default.nix')
-rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 16da52294bd..9fccc27ef63 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,6 @@ -{stdenv, git, cacert}: let +{stdenvNoCC, git, cacert}: let urlToName = url: rev: let - inherit (stdenv.lib) removeSuffix splitString last; + inherit (stdenvNoCC.lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; @@ -48,7 +48,7 @@ assert deepClone -> leaveDotGit; if md5 != "" then throw "fetchgit does not support md5 anymore, please use sha256" else -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { inherit name; builder = ./builder.sh; fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. @@ -62,7 +62,7 @@ stdenv.mkDerivation { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; |