Merge pull request #336488 from rhelmot/freebsd-stdenv-no-features

stdenv/freebsd: build bootstrap files without recursive-nix feature

authored by philiptaron.tngl.sh and committed by GitHub 3014c8be 95cd4025

+7 -10
+7 -10
pkgs/stdenv/freebsd/make-bootstrap-tools.nix
··· 1 { pkgs ? import ../../.. {} }: 2 let 3 - inherit (pkgs) runCommand lib; 4 # splicing doesn't seem to work right here 5 - inherit (pkgs.buildPackages) nix rsync; 6 pack-all = 7 packCmd: name: pkgs: fixups: 8 (runCommand name { 9 - requiredSystemFeatures = [ "recursive-nix" ]; 10 - nativeBuildInputs = [ nix rsync ]; 11 } '' 12 base=$PWD 13 - requisites="$(nix-store --query --requisites ${lib.concatStringsSep " " pkgs} | tac)" 14 - 15 - rm -f $base/nix-support/propagated-build-inputs 16 for f in $requisites; do 17 cd $f 18 - rsync --chmod="+w" -av . $base 19 done 20 cd $base 21 ··· 28 cat $f >>"$base/nix-support/$f" 29 done 30 done 31 cd $base 32 33 ${fixups} 34 35 - rm .nix-socket 36 ${packCmd} 37 ''); 38 - nar-all = pack-all "nix-store --dump . | xz -9 -e -T $NIX_BUILD_CORES >$out"; 39 tar-all = pack-all "XZ_OPT=\"-9 -e -T $NIX_BUILD_CORES\" tar cJf $out --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 ."; 40 coreutils-big = pkgs.coreutils.override { singleBinary = false; }; 41 mkdir = runCommand "mkdir" { coreutils = coreutils-big; } ''
··· 1 { pkgs ? import ../../.. {} }: 2 let 3 + inherit (pkgs) runCommand closureInfo; 4 # splicing doesn't seem to work right here 5 + inherit (pkgs.buildPackages) dumpnar rsync; 6 pack-all = 7 packCmd: name: pkgs: fixups: 8 (runCommand name { 9 + nativeBuildInputs = [ rsync dumpnar ]; 10 } '' 11 base=$PWD 12 + requisites="$(cat ${closureInfo { rootPaths = pkgs; }}/store-paths)" 13 for f in $requisites; do 14 cd $f 15 + rsync --safe-links --chmod="+w" -av . $base 16 done 17 cd $base 18 ··· 25 cat $f >>"$base/nix-support/$f" 26 done 27 done 28 + rm -f $base/nix-support/propagated-build-inputs 29 cd $base 30 31 ${fixups} 32 33 ${packCmd} 34 ''); 35 + nar-all = pack-all "dumpnar . | xz -9 -e -T $NIX_BUILD_CORES >$out"; 36 tar-all = pack-all "XZ_OPT=\"-9 -e -T $NIX_BUILD_CORES\" tar cJf $out --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 ."; 37 coreutils-big = pkgs.coreutils.override { singleBinary = false; }; 38 mkdir = runCommand "mkdir" { coreutils = coreutils-big; } ''