diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-07-14T16·25+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14T16·25+0200 |
| commit | 15e8bd3bcb9b458ad3bc6188bdf531ecb6d65c4a (patch) | |
| tree | ca02e7f35a6348de3b767e1d556c56d11ed106a7 /release.nix | |
| parent | 112ff7833d4f3a233755b2fe856b2eb2b3723254 (diff) | |
| parent | e0d39c8dc47af203ef0647c277e0e26f3b9176d4 (diff) | |
Merge pull request #1466 from grahamc/nix-master-darwin-install
Multi-user installer for Darwin (master edition)
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/release.nix b/release.nix index 1348ef7b93fe..796591cc1671 100644 --- a/release.nix +++ b/release.nix @@ -137,7 +137,7 @@ let runCommand "nix-binary-tarball-${version}" { exportReferencesGraph = [ "closure1" toplevel "closure2" cacert ]; - buildInputs = [ perl ]; + buildInputs = [ perl shellcheck ]; meta.description = "Distribution-independent Nix bootstrap binaries for ${system}"; } '' @@ -146,7 +146,15 @@ let substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \ --subst-var-by nix ${toplevel} \ --subst-var-by cacert ${cacert} + substitute ${./scripts/install-darwin-multi-user.sh} $TMPDIR/install-darwin-multi-user \ + --subst-var-by nix ${toplevel} \ + --subst-var-by cacert ${cacert} + + shellcheck -e SC1090 $TMPDIR/install + shellcheck -e SC1091,SC2002 $TMPDIR/install-darwin-multi-user + chmod +x $TMPDIR/install + chmod +x $TMPDIR/install-darwin-multi-user dir=nix-${version}-${system} fn=$out/$dir.tar.bz2 mkdir -p $out/nix-support @@ -158,7 +166,7 @@ let --transform "s,$TMPDIR/install,$dir/install," \ --transform "s,$TMPDIR/reginfo,$dir/.reginfo," \ --transform "s,$NIX_STORE,$dir/store,S" \ - $TMPDIR/install $TMPDIR/reginfo $storePaths + $TMPDIR/install $TMPDIR/install-darwin-multi-user $TMPDIR/reginfo $storePaths ''); |