[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
60/118: Make dev-shell script work on Darwin
From: |
Ludovic Courtès |
Subject: |
60/118: Make dev-shell script work on Darwin |
Date: |
Tue, 19 May 2015 14:45:40 +0000 |
civodul pushed a commit to branch nix
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
'" \
- 48/118: Fix broken Pid constructor, (continued)
- 48/118: Fix broken Pid constructor, Ludovic Courtès, 2015/05/19
- 51/118: build-remote.pl: Use ‘nix-store --serve’ on the remote side, Ludovic Courtès, 2015/05/19
- 62/118: Be more strict about file names in NARs, Ludovic Courtès, 2015/05/19
- 65/118: nix-daemon: Only print connection info if we have SO_PEERCRED, Ludovic Courtès, 2015/05/19
- 72/118: Remove dead code, Ludovic Courtès, 2015/05/19
- 55/118: build-remote.pl: Fix building multiple output derivations, Ludovic Courtès, 2015/05/19
- 59/118: Install systemd and Upstart stuff only on Linux, Ludovic Courtès, 2015/05/19
- 68/118: Ugly hack to fix building on old Darwin, Ludovic Courtès, 2015/05/19
- 64/118: nix-daemon: Fix compat with older clients, Ludovic Courtès, 2015/05/19
- 61/118: Handle case collisions on case-insensitive systems, Ludovic Courtès, 2015/05/19
- 60/118: Make dev-shell script work on Darwin,
Ludovic Courtès <=
- 71/118: Revert old useBuildHook behaviour, Ludovic Courtès, 2015/05/19
- 63/118: Get rid of a compiler warning, Ludovic Courtès, 2015/05/19
- 67/118: nix-daemon: Add trusted-users and allowed-users options, Ludovic Courtès, 2015/05/19
- 70/118: Better fix for strcasecmp on Darwin, Ludovic Courtès, 2015/05/19
- 75/118: Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix, Ludovic Courtès, 2015/05/19
- 74/118: Merge commit '8e9140cfdef9dbd1eb61e4c75c91d452ab5e4a74' into nix, Ludovic Courtès, 2015/05/19
- 73/118: startProcess: Make writing error messages from the child more robust, Ludovic Courtès, 2015/05/19
- 69/118: Bump, Ludovic Courtès, 2015/05/19
- 86/118: Add option ‘build-extra-chroot-dirs’, Ludovic Courtès, 2015/05/19
- 76/118: nix-daemon: Simplify stderr handling, Ludovic Courtès, 2015/05/19