diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-19 17:02:16 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-19 17:02:16 +0200 |
| commit | 0106d6b40dc0b8f1c81326e633bfa5134a446a9c (patch) | |
| tree | 978cc8408f2d52a024f692a31e98cb555da95462 /configure.ac | |
| parent | 7e66e0b3e7f69e045362f9452f9b745aa850d354 (diff) | |
| parent | 793a66e5fef3f562080000280c022af517aad612 (diff) | |
| download | guix-0106d6b40dc0b8f1c81326e633bfa5134a446a9c.tar guix-0106d6b40dc0b8f1c81326e633bfa5134a446a9c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index b866e91b2c..b34f15a77b 100644 --- a/configure.ac +++ b/configure.ac @@ -160,18 +160,11 @@ AC_ARG_WITH([nix-prefix], esac], []) -AC_PATH_PROG([NIX_INSTANTIATE], [nix-instantiate]) AC_PATH_PROG([NIX_HASH], [nix-hash]) -if test "x$guix_build_daemon$NIX_INSTANTIATE$NIX_HASH" = "xno"; then +if test "x$guix_build_daemon$NIX_HASH" = "xno"; then AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.]) fi -if test "x$NIX_INSTANTIATE" = "x"; then - # This program is an optional dependency, so we just want it to be - # taken from $PATH if it's not available right now. - NIX_INSTANTIATE="nix-instantiate" -fi - AC_ARG_WITH([nixpkgs], [AS_HELP_STRING([--with-nixpkgs=DIR], [search for Nixpkgs in DIR (for testing purposes only)])], |