diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-06-19 15:29:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-19 15:29:21 +0200 |
| commit | 1fb947f6d7b7d4859d2f2a495d78b4745557b5ca (patch) | |
| tree | ac43445aa27de0fbb1a8c7a12a54408fbfc3ef6a /gnu/packages/package-management.scm | |
| parent | 3f311279d35a00c40536ee37c7808f42ed5fae4b (diff) | |
| download | guix-patches-1fb947f6d7b7d4859d2f2a495d78b4745557b5ca.tar guix-patches-1fb947f6d7b7d4859d2f2a495d78b4745557b5ca.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0a114caa5a..6a55f62ee6 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) |