From bb65460feb265be4d938c7dc724a76ef41a8bfaf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Jul 2014 11:19:12 +0200 Subject: [PATCH] Make dev-shell script work on Darwin --- dev-shell | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-shell b/dev-shell index 2fe62a4696..eae9246f47 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 '" \