01/01: gnu: guix-daemon: Build in the absence of guile-sqlite3.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1fb947f6d7b7d4859d2f2a495d78b4745557b5ca
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jun 19 15:29:21 2018 +0200

    gnu: guix-daemon: Build in the absence of guile-sqlite3.
    
    Fixes a regression introduced in
    3f311279d35a00c40536ee37c7808f42ed5fae4b whereby guix-daemon's configure
    would error out due to the lack of guile-sqlite3.
    
    * gnu/packages/package-management.scm (guix-daemon)[inputs]: Remove
    "boot-guile", "boot-guile/i686", and "util-linux".
    [arguments]: Add #:configure-flags.
---
 gnu/packages/package-management.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 0a114ca..6a55f62 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -310,11 +310,18 @@ the Nix package manager.")
     (inputs
      `(("gnutls" ,gnutls)
        ("guile-git" ,guile-git)
-       ,@(package-inputs guix)))
+       ,@(fold alist-delete (package-inputs guix)
+               '("boot-guile" "boot-guile/i686" "util-linux"))))
+
     (propagated-inputs '())
 
     (arguments
      (substitute-keyword-arguments (package-arguments guix)
+       ((#:configure-flags flags '())
+        ;; Pretend we have those libraries; we don't actually need them.
+        `(append ,flags
+                 '("guix_cv_have_recent_guile_sqlite3=yes"
+                   "guix_cv_have_recent_guile_ssh=yes")))
        ((#:tests? #f #f)
         #f)
        ((#:phases phases '%standard-phases)