lol

freshBootstrapTools.build: put bootstrapFiles into stdenv-bootstrap-tools.nix

+14 -7
+1 -5
pkgs/stdenv/linux/make-bootstrap-tools.nix
··· 47 47 inherit bootBinutils coreutilsMinimal tarMinimal busyboxMinimal bootGCC libc patchelf; 48 48 }; 49 49 50 - bootstrapFiles = { 51 - # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox 52 - busybox = runCommand "busybox" {} "cp ${build}/on-server/busybox $out"; 53 - bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; 54 - }; 50 + inherit (build) bootstrapFiles; 55 51 56 52 bootstrapTools = 57 53 let extraAttrs = lib.optionalAttrs
+13 -2
pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
··· 23 23 mpfr, 24 24 patch, 25 25 patchelf, 26 + runCommand, 26 27 tarMinimal, 27 28 zlib, 28 29 }: ··· 30 31 # ${libc.src}/sysdeps/unix/sysv/linux/loongarch/lp64/libnsl.abilist does not exist! 31 32 withLibnsl = !stdenv.hostPlatform.isLoongArch64; 32 33 in 33 - stdenv.mkDerivation { 34 + stdenv.mkDerivation (finalAttrs: { 34 35 name = "stdenv-bootstrap-tools"; 35 36 36 37 meta = { ··· 208 209 # that we can safely copy them out of the store and to other 209 210 # locations in the store. 210 211 allowedReferences = [ ]; 211 - } 212 + 213 + passthru = { 214 + bootstrapFiles = { 215 + # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox 216 + busybox = runCommand "busybox" { } "cp ${finalAttrs.finalPackage}/on-server/busybox $out"; 217 + bootstrapTools = 218 + runCommand "bootstrap-tools.tar.xz" { } 219 + "cp ${finalAttrs.finalPackage}/on-server/bootstrap-tools.tar.xz $out"; 220 + }; 221 + }; 222 + })