diff options
| -rw-r--r-- | nix-support/binary-tarball.nix | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/nix-support/binary-tarball.nix b/nix-support/binary-tarball.nix index 7b9bf5c2b..69ffb3d4c 100644 --- a/nix-support/binary-tarball.nix +++ b/nix-support/binary-tarball.nix @@ -5,29 +5,33 @@ system, }: let - installerClosureInfo = buildPackages.closureInfo { - rootPaths = [ - nix - cacert - ]; - }; + rootPaths = [ + nix + cacert + ]; + installerClosureInfo = buildPackages.closureInfo { inherit rootPaths; }; meta.description = "Distribution-independent Lix bootstrap binaries for ${system}"; in -buildPackages.runCommand "lix-binary-tarball-${nix.version}" { inherit meta; } '' - cp ${installerClosureInfo}/registration $TMPDIR/reginfo +buildPackages.runCommand "lix-binary-tarball-${nix.version}" + { + inherit meta; + passthru.rootPaths = rootPaths; + } + '' + cp ${installerClosureInfo}/registration $TMPDIR/reginfo - dir=lix-${nix.version}-${system} - fn=$out/$dir.tar.xz - mkdir -p $out/nix-support - echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products - tar cvfJ $fn \ - --owner=0 --group=0 --mode=u+rw,uga+r \ - --mtime='1970-01-01' \ - --absolute-names \ - --hard-dereference \ - --transform "s,$TMPDIR/reginfo,$dir/.reginfo," \ - --transform "s,$NIX_STORE,$dir/store,S" \ - $TMPDIR/reginfo \ - $(cat ${installerClosureInfo}/store-paths) -'' + dir=lix-${nix.version}-${system} + fn=$out/$dir.tar.xz + mkdir -p $out/nix-support + echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products + tar cvfJ $fn \ + --owner=0 --group=0 --mode=u+rw,uga+r \ + --mtime='1970-01-01' \ + --absolute-names \ + --hard-dereference \ + --transform "s,$TMPDIR/reginfo,$dir/.reginfo," \ + --transform "s,$NIX_STORE,$dir/store,S" \ + $TMPDIR/reginfo \ + $(cat ${installerClosureInfo}/store-paths) + '' |