diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-26 16:56:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-02 13:52:41 -0500 |
| commit | ab651d2c9bab620ebe5e515476fbd70d2c5b0c61 (patch) | |
| tree | c214263d6b5dc420fa1fab98b42dcc79951e7df6 /pkgs/top-level | |
| parent | 804285f589ded484b530750dd1ec03b9052bcdac (diff) | |
| download | nixpkgs-ab651d2c9bab620ebe5e515476fbd70d2c5b0c61.tar nixpkgs-ab651d2c9bab620ebe5e515476fbd70d2c5b0c61.tar.gz nixpkgs-ab651d2c9bab620ebe5e515476fbd70d2c5b0c61.tar.bz2 nixpkgs-ab651d2c9bab620ebe5e515476fbd70d2c5b0c61.tar.lz nixpkgs-ab651d2c9bab620ebe5e515476fbd70d2c5b0c61.tar.xz nixpkgs-ab651d2c9bab620ebe5e515476fbd70d2c5b0c61.tar.zst nixpkgs-ab651d2c9bab620ebe5e515476fbd70d2c5b0c61.zip | |
linux bootstrap tools: Use same derivation whether cross compiling or not
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 62f7134616b..b00d74b5e14 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -123,6 +123,8 @@ in bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; maintainers = [ lib.maintainers.dezgeg ]; - mkBootstrapToolsJob = drv: hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); + mkBootstrapToolsJob = drv: + assert lib.elem drv.system (supportedSystems ++ [ "aarch64-linux" ]); + hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 201c3a38cf8..5358738acb6 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -123,7 +123,10 @@ let stdenvBootstrapTools = with lib; genAttrs systemsWithAnySupport (system: { - inherit (import ../stdenv/linux/make-bootstrap-tools.nix { inherit system; }) + inherit + (import ../stdenv/linux/make-bootstrap-tools.nix { + localSystem = { inherit system; }; + }) dist test; }) # darwin is special in this |