diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-12-15 13:06:05 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-12-15 13:08:21 +0100 |
| commit | 7a586794d4378d7a6432192700a4706083d58388 (patch) | |
| tree | e5d235869ad3ae745d2b5c95d2eab1dc6d605f0e | |
| parent | 705829b29ad5c4ac453015b8af265f0956517216 (diff) | |
| download | nixlib-7a586794d4378d7a6432192700a4706083d58388.tar nixlib-7a586794d4378d7a6432192700a4706083d58388.tar.gz nixlib-7a586794d4378d7a6432192700a4706083d58388.tar.bz2 nixlib-7a586794d4378d7a6432192700a4706083d58388.tar.lz nixlib-7a586794d4378d7a6432192700a4706083d58388.tar.xz nixlib-7a586794d4378d7a6432192700a4706083d58388.tar.zst nixlib-7a586794d4378d7a6432192700a4706083d58388.zip | |
make-tarball.nix: Fix running as root
Since Nix now runs builds in a user namespace with uid == 0, this triggered the message warning: the group ‘nixbld’ specified in ‘build-users-group’ does not exist which make-tarball.nix turns into a fatal error. So clear build-users-group. http://hydra.nixos.org/build/44817408
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 88f027157968..a69e7019c874 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -35,6 +35,7 @@ releaseTools.sourceTarball rec { export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR export NIX_PATH=nixpkgs=$TMPDIR/barf.nix + opts=(--option build-users-group "") nix-store --init echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix @@ -68,7 +69,8 @@ releaseTools.sourceTarball rec { nix-env -f . \ --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log + -qa --drv-path --system-filter \* --system \ + "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" @@ -78,7 +80,8 @@ releaseTools.sourceTarball rec { nix-env -f . \ --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system --meta --xml > /dev/null + -qa --drv-path --system-filter \* --system --meta --xml \ + "''${opts[@]}" > /dev/null stopNest done |