diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-12 14:32:56 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-12 14:32:56 +0100 |
commit | d688c7cd05b155e223e478b6e6bda97737d1441b (patch) | |
tree | 0b4dde8f69993136500d34724a0e511b1005c175 /pkgs/build-support | |
parent | 20b3bd194bc5a491bee91de90447cec144b8eb6b (diff) | |
parent | 326e5ec55bfdb0b18bf010e88b430cbf931d7c56 (diff) | |
download | nixlib-d688c7cd05b155e223e478b6e6bda97737d1441b.tar nixlib-d688c7cd05b155e223e478b6e6bda97737d1441b.tar.gz nixlib-d688c7cd05b155e223e478b6e6bda97737d1441b.tar.bz2 nixlib-d688c7cd05b155e223e478b6e6bda97737d1441b.tar.lz nixlib-d688c7cd05b155e223e478b6e6bda97737d1441b.tar.xz nixlib-d688c7cd05b155e223e478b6e6bda97737d1441b.tar.zst nixlib-d688c7cd05b155e223e478b6e6bda97737d1441b.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/fetchurl/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 6300587a7d15..7d23a3a7f8f1 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC. +{ lib, buildPackages ? { inherit stdenvNoCC; }, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC. let @@ -10,7 +10,7 @@ let # resulting store derivations (.drv files) much smaller, which in # turn makes nix-env/nix-instantiate faster. mirrorsFile = - stdenvNoCC.mkDerivation ({ + buildPackages.stdenvNoCC.mkDerivation ({ name = "mirrors-list"; builder = ./write-mirror-list.sh; preferLocalBuild = true; |