From 5b7c6a11b5d50b8f28f74da828eda07bef806fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 16 Jun 2016 11:18:16 +0100 Subject: [PATCH] travis-ci: remount only on linux --- maintainers/scripts/travis-nox-review-pr.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index a366ac435bd109..092fc0cd9d07ca 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -13,10 +13,6 @@ if [[ $1 == nix ]]; then sudo mkdir /etc/nix sudo sh -c 'echo "build-max-jobs = 4" > /etc/nix/nix.conf' - # Nix builds in /tmp and we need exec support - sudo mount - sudo mount -o remount,exec /run - # Verify evaluation echo "=== Verifying that nixpkgs evaluates..." nix-env -f. -qa --json >/dev/null @@ -30,6 +26,11 @@ elif [[ $1 == build ]]; then if [[ $TRAVIS_OS_NAME == "osx" ]]; then echo "Skipping NixOS things on darwin" else + # Nix builds in /tmp and we need exec support + sudo mount -o remount,exec /run + sudo mount -o remount,exec /run/user + sudo mount + echo "=== Checking NixOS options" nix-build nixos/release.nix -A options --show-trace