diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-01-15 14:21:04 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-15 14:21:04 -0500 |
commit | cef5131ea79029904bd9ae103f358f4ef6ad998c (patch) | |
tree | 38bb4e37aead6ec9eddb2c2b261387f955083639 | |
parent | f9a9ea920a3bf225a932220e6bce0ba0f947542d (diff) | |
parent | a62ee8d45cd6d62ac5a985a386a4280a7c4059a6 (diff) |
Merge pull request #21911 from Ericson2314/release-cross
release-cross: Expose sub-jobs of linux cross stdenv
-rw-r--r-- | pkgs/top-level/release-cross.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ec013816145cf..f582bcf3b3234 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; } |