diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-08 14:00:47 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-08 14:00:47 +0200 |
commit | f1f79505fc854a4eda421ab4d97d713bc6a2329b (patch) | |
tree | 301be28bf3b0047b4e2dc4303b33f0706590e951 | |
parent | d48eaa3ea0e863e6c00285669e3deba8f9c2e24a (diff) |
find-tarballs.nix: Handle stdenv bootstrap fetchurl
-rw-r--r-- | maintainers/scripts/find-tarballs.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 006594596602..ad79af90901e 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -14,12 +14,12 @@ let operator = const [ ]; }); - urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; + urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat" - && drv.postFetch or "" == "" && drv ? urls) + && drv.postFetch or "" == "" && (drv ? url || drv ? urls)) dependencies; dependencies = map (x: x.value) (genericClosure { |