X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e..c2baa33e4b5963ca3343b0d180e2566611ccd23e:/configure.ac?ds=sidebyside diff --git a/configure.ac b/configure.ac index afb449950f..aa60471143 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ AM_GNU_GETTEXT_VERSION([0.18.1]) GUIX_SYSTEM_TYPE GUIX_ASSERT_SUPPORTED_SYSTEM +GUIX_CHANNEL_METADATA AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"]) @@ -194,19 +195,6 @@ AC_SUBST([GZIP]) AC_SUBST([BZIP2]) AC_SUBST([XZ]) -AC_ARG_WITH([nix-prefix], - [AS_HELP_STRING([--with-nix-prefix=DIR], - [search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])], - [case "$withval" in - yes|no) ;; - *) - NIX_PREFIX="$withval" - PATH="$NIX_PREFIX/bin:$PATH"; export PATH - AC_SUBST([NIX_PREFIX]) - ;; - esac], - []) - AC_ARG_WITH([nixpkgs], [AS_HELP_STRING([--with-nixpkgs=DIR], [search for Nixpkgs in DIR (for testing purposes only)])],