aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-14 21:31:37 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-14 21:31:37 +0200
commit327569035c70b6171347e5c9c0cd3de4fd7383eb (patch)
tree30d26f92c4dddd32342a51e464b4fa02f4d8c047
parent45fd703bffdf6c56e32f108ce92852d603955045 (diff)
parent5839597c664257ccc8c9ec872d9d3edac5aace41 (diff)
Merge pull request #858 from Warbo/32bit-dev-shell
Add 32bit linux clause to dev-shell
-rwxr-xr-xdev-shell2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev-shell b/dev-shell
index eae9246f4..5a090ded6 100755
--- a/dev-shell
+++ b/dev-shell
@@ -11,7 +11,7 @@ exec $s release.nix -A tarball --command "
export NIX_PATH='$NIX_PATH'
export NIX_BUILD_SHELL=$(type -p bash)
export c=\$configureFlags
- exec $s release.nix -A build.$(if [ $(uname -s) = Darwin ]; then echo x86_64-darwin; else echo x86_64-linux; fi) --exclude tarball --command '
+ exec $s release.nix -A build.$(if [ $(uname -s) = Darwin ]; then echo x86_64-darwin; elif [[ $(uname -m) =~ ^i[3456]86$ ]]; then echo i686-linux; else echo x86_64-linux; fi) --exclude tarball --command '
configureFlags+=\" \$c --prefix=$(pwd)/inst --sysconfdir=$(pwd)/inst/etc\"
return
'" \