diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-03-27T13·57+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27T13·57+0200 |
| commit | 7ec13eda9bf501c2619a147097d68a9849e3334d (patch) | |
| tree | 40cddaad764957430a02ed027210a94843f7479f | |
| parent | 0cb1e52052901c375d2b9d6bfb475b181f4464c2 (diff) | |
| parent | cc6712ae90fb0783c51f1b3f86433adcd11a4ccb (diff) | |
Merge pull request #2011 from dezgeg/use-closureinfo
release.nix: Use pkgs.closureInfo for binaryTarball
| -rw-r--r-- | release.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/release.nix b/release.nix index 5fae5468bf50..91c782c51916 100644 --- a/release.nix +++ b/release.nix @@ -115,16 +115,15 @@ let let toplevel = builtins.getAttr system jobs.build; version = toplevel.src.version; + installerClosureInfo = closureInfo { rootPaths = [ toplevel cacert ]; }; in runCommand "nix-binary-tarball-${version}" - { exportReferencesGraph = [ "closure1" toplevel "closure2" cacert ]; - buildInputs = [ perl ] ++ lib.optional (system != "aarch64-linux") shellcheck; + { nativeBuildInputs = lib.optional (system != "aarch64-linux") shellcheck; meta.description = "Distribution-independent Nix bootstrap binaries for ${system}"; } '' - storePaths=$(perl ${pathsFromGraph} ./closure1 ./closure2) - printRegistration=1 perl ${pathsFromGraph} ./closure1 ./closure2 > $TMPDIR/reginfo + cp ${installerClosureInfo}/registration $TMPDIR/reginfo substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \ --subst-var-by nix ${toplevel} \ --subst-var-by cacert ${cacert} @@ -150,7 +149,8 @@ let --transform "s,$TMPDIR/install,$dir/install," \ --transform "s,$TMPDIR/reginfo,$dir/.reginfo," \ --transform "s,$NIX_STORE,$dir/store,S" \ - $TMPDIR/install $TMPDIR/install-darwin-multi-user $TMPDIR/reginfo $storePaths + $TMPDIR/install $TMPDIR/install-darwin-multi-user $TMPDIR/reginfo \ + $(cat ${installerClosureInfo}/store-paths) ''); |