guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/06: maint: Remove unused '--with-nix-prefix' configure option.


From: guix-commits
Subject: 01/06: maint: Remove unused '--with-nix-prefix' configure option.
Date: Sun, 27 Dec 2020 11:24:46 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit a016a451c41486d8f8277742d47157cc2597d5bc
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Dec 23 23:59:26 2020 +0100

    maint: Remove unused '--with-nix-prefix' configure option.
    
    * configure.ac: Remove '--with-nix-prefix' and 'NIX_PREFIX' variable.
    * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Remove '--with-nix-prefix'.
---
 Makefile.am  |  1 -
 configure.ac | 13 -------------
 2 files changed, 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e0ee65f..aec2bb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -722,7 +722,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS =                      \
   --localstatedir="$$dc_install_base/var"      \
   --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)"        \
   --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)"        \
-  --with-nix-prefix="$(NIX_PREFIX)"            \
   --enable-daemon                              \
   ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
 
diff --git a/configure.ac b/configure.ac
index afb4499..aa97f67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,19 +194,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)])],



reply via email to

[Prev in Thread] Current Thread [Next in Thread]