summary refs log tree commit diff
path: root/pkgs/top-level/release-cross.nix
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@Yahoo.com>2017-01-15 14:06:35 -0500
committerJohn Ericson <Ericson2314@Yahoo.com>2017-01-15 14:19:39 -0500
commita62ee8d45cd6d62ac5a985a386a4280a7c4059a6 (patch)
treef8dc192c7e10eb2682be670bc418eb7c1e2ab95a /pkgs/top-level/release-cross.nix
parent27b47ef7360f6dee2fec603f22854bff023a2d57 (diff)
downloadnixpkgs-a62ee8d45cd6d62ac5a985a386a4280a7c4059a6.tar
nixpkgs-a62ee8d45cd6d62ac5a985a386a4280a7c4059a6.tar.gz
nixpkgs-a62ee8d45cd6d62ac5a985a386a4280a7c4059a6.tar.bz2
nixpkgs-a62ee8d45cd6d62ac5a985a386a4280a7c4059a6.tar.lz
nixpkgs-a62ee8d45cd6d62ac5a985a386a4280a7c4059a6.tar.xz
nixpkgs-a62ee8d45cd6d62ac5a985a386a4280a7c4059a6.tar.zst
nixpkgs-a62ee8d45cd6d62ac5a985a386a4280a7c4059a6.zip
release-cross: Expose sub-jobs of linux cross stdenv
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r--pkgs/top-level/release-cross.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index ec013816145..f582bcf3b32 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -8,7 +8,7 @@
 with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
 
 let
-  lib = import ../../lib;
+  inherit (pkgs) lib;
 
   nativePlatforms = linux;
 
@@ -192,7 +192,7 @@ in
   /* Cross-built bootstrap tools for every supported platform */
   bootstrapTools = let
     tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
-    maintainers = [ pkgs.lib.maintainers.dezgeg ];
-    mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist);
-  in pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
+    maintainers = [ lib.maintainers.dezgeg ];
+    mkBootstrapToolsJob = drv: hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv);
+  in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools;
 }