aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-16 11:19:12 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-16 11:53:47 +0200
commitbb65460feb265be4d938c7dc724a76ef41a8bfaf (patch)
tree666914a4dd011aa787f1d154e1dc2ce6bf02f6e6
parentde8be7c3e06b52c313e0b452b641ad5f90dca2fe (diff)
Make dev-shell script work on Darwin
-rwxr-xr-xdev-shell5
1 files changed, 3 insertions, 2 deletions
diff --git a/dev-shell b/dev-shell
index 2fe62a469..eae9246f4 100755
--- a/dev-shell
+++ b/dev-shell
@@ -6,11 +6,12 @@ fi
s=$(type -p nix-shell)
exec $s release.nix -A tarball --command "
- export NIX_REMOTE=daemon
+ unset http_proxy
+ export NIX_REMOTE=$NIX_REMOTE
export NIX_PATH='$NIX_PATH'
export NIX_BUILD_SHELL=$(type -p bash)
export c=\$configureFlags
- exec $s release.nix -A build.x86_64-linux --exclude tarball --command '
+ exec $s release.nix -A build.$(if [ $(uname -s) = Darwin ]; then echo x86_64-darwin; else echo x86_64-linux; fi) --exclude tarball --command '
configureFlags+=\" \$c --prefix=$(pwd)/inst --sysconfdir=$(pwd)/inst/etc\"
return
'" \