[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
60/376: Make dev-shell script work on Darwin
From: |
Ludovic Courtès |
Subject: |
60/376: Make dev-shell script work on Darwin |
Date: |
Wed, 28 Jan 2015 22:04:02 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit bb65460feb265be4d938c7dc724a76ef41a8bfaf
Author: Eelco Dolstra <address@hidden>
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
'" \
- 51/376: build-remote.pl: Use ‘nix-store --serve’ on the remote side, (continued)
- 51/376: build-remote.pl: Use ‘nix-store --serve’ on the remote side, Ludovic Courtès, 2015/01/28
- 50/376: Fix closure size display, Ludovic Courtès, 2015/01/28
- 63/376: Get rid of a compiler warning, Ludovic Courtès, 2015/01/28
- 43/376: Remove tabs, Ludovic Courtès, 2015/01/28
- 64/376: nix-daemon: Fix compat with older clients, Ludovic Courtès, 2015/01/28
- 57/376: Manual: Typo, Ludovic Courtès, 2015/01/28
- 53/376: build-remote.pl: Fix build log, Ludovic Courtès, 2015/01/28
- 61/376: Handle case collisions on case-insensitive systems, Ludovic Courtès, 2015/01/28
- 66/376: nix-daemon: Show name of connecting user, Ludovic Courtès, 2015/01/28
- 59/376: Install systemd and Upstart stuff only on Linux, Ludovic Courtès, 2015/01/28
- 60/376: Make dev-shell script work on Darwin,
Ludovic Courtès <=
- 68/376: Ugly hack to fix building on old Darwin, Ludovic Courtès, 2015/01/28
- 75/376: nix-store --serve: Monitor for client disconnects, Ludovic Courtès, 2015/01/28
- 70/376: Better fix for strcasecmp on Darwin, Ludovic Courtès, 2015/01/28
- 73/376: startProcess: Make writing error messages from the child more robust, Ludovic Courtès, 2015/01/28
- 67/376: nix-daemon: Add trusted-users and allowed-users options, Ludovic Courtès, 2015/01/28
- 56/376: Remove cruft, Ludovic Courtès, 2015/01/28
- 76/376: nix-daemon: Simplify stderr handling, Ludovic Courtès, 2015/01/28
- 71/376: Revert old useBuildHook behaviour, Ludovic Courtès, 2015/01/28
- 65/376: nix-daemon: Only print connection info if we have SO_PEERCRED, Ludovic Courtès, 2015/01/28
- 69/376: Bump, Ludovic Courtès, 2015/01/28