civodul pushed a commit to tag 1.8
in repository guix.
commit bb65460feb265be4d938c7dc724a76ef41a8bfaf
Author: Eelco Dolstra <[email protected]>
Date: Wed Jul 16 11:19:12 2014 +0200
Make dev-shell script work on Darwin
---
dev-shell | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-shell b/dev-shell
index 2fe62a4..eae9246 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
'" \
