freshBootstrapTools.bootstrapTools: extract as a package

+27 -17
+25
pkgs/stdenv/darwin/bootstrap-tools.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + bootstrapTools, 5 + unpack, 6 + }: 7 + 8 + builtins.derivation { 9 + inherit (stdenv.hostPlatform) system; 10 + 11 + name = "bootstrap-tools"; 12 + builder = "${unpack}/bin/bash"; 13 + 14 + args = [ 15 + "${unpack}/bootstrap-tools-unpack.sh" 16 + bootstrapTools 17 + ]; 18 + 19 + PATH = lib.makeBinPath [ 20 + (builtins.placeholder "out") 21 + unpack 22 + ]; 23 + 24 + allowedReferences = [ "out" ]; 25 + }
+2 -17
pkgs/stdenv/darwin/make-bootstrap-tools.nix
··· 291 291 ''; 292 292 }; 293 293 294 - bootstrapTools = derivation { 295 - inherit (stdenv.hostPlatform) system; 296 - 297 - name = "bootstrap-tools"; 298 - builder = "${bootstrapFiles.unpack}/bin/bash"; 299 - 300 - args = [ 301 - "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh" 302 - bootstrapFiles.bootstrapTools 303 - ]; 304 - 305 - PATH = lib.makeBinPath [ 306 - (placeholder "out") 307 - bootstrapFiles.unpack 308 - ]; 309 - 310 - allowedReferences = [ "out" ]; 294 + bootstrapTools = pkgs.callPackage ./bootstrap-tools.nix { 295 + inherit (bootstrapFiles) bootstrapTools unpack; 311 296 }; 312 297 313 298 test = derivation {