summary refs log tree commit diff
path: root/pkgs/os-specific/darwin/apple-source-releases/default.nix
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-11-17 17:23:24 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-19 20:55:59 +0000
commita1fec8667dceac682f4cd5deeb9dff28fcee5e37 (patch)
tree521418c0a04f11adb679de7c7883203af728ed8d /pkgs/os-specific/darwin/apple-source-releases/default.nix
parent7226ab90843f8cb366f0e6f90ba16e8214e19bdb (diff)
downloadnixpkgs-a1fec8667dceac682f4cd5deeb9dff28fcee5e37.tar
nixpkgs-a1fec8667dceac682f4cd5deeb9dff28fcee5e37.tar.gz
nixpkgs-a1fec8667dceac682f4cd5deeb9dff28fcee5e37.tar.bz2
nixpkgs-a1fec8667dceac682f4cd5deeb9dff28fcee5e37.tar.lz
nixpkgs-a1fec8667dceac682f4cd5deeb9dff28fcee5e37.tar.xz
nixpkgs-a1fec8667dceac682f4cd5deeb9dff28fcee5e37.tar.zst
nixpkgs-a1fec8667dceac682f4cd5deeb9dff28fcee5e37.zip
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl` itself
The only outside-curl uses of `fetchurlBoot` left are `stdenv`
and `apple-source-releases`. The latter one can probably be removed
too, but I can't test it.

Pros:

- Aggregates all behind-the-scenes insanity in a single place.

Cons:

- At the cost of 10 more derivations (but 0 new outpaths).
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases/default.nix')
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 4fa0c0e3e47..c9473bca06d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }:
+{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }:
 
 let
   # This attrset can in theory be computed automatically, but for that to work nicely we need
@@ -141,7 +141,7 @@ let
     # in an infinite recursion without this. It's not clear why this
     # worked fine when not cross-compiling
     fetch = if name == "libiconv"
-      then fetchurlBoot
+      then stdenv.fetchurlBoot
       else fetchurl;
   in fetch {
     url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz";