diff options
| author | Vivien Kraus <vivien@planete-kraus.eu> | 2022-11-26 16:56:58 +0100 |
|---|---|---|
| committer | Vivien Kraus <vivien@planete-kraus.eu> | 2022-11-29 22:37:58 +0100 |
| commit | 495e8237d6415d822014e713747b09132f7690d5 (patch) | |
| tree | cfb0ccc63866df9528abce76931f6b8ac8ffdfab | |
| parent | 94e0c4e0d9127be3985b4f30f199b6878fe7cd95 (diff) | |
Require GnuTLS
| -rw-r--r-- | disfluid/maintainer/channel-code.scm | 4 | ||||
| -rw-r--r-- | disfluid/maintainer/new-phases.scm | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/disfluid/maintainer/channel-code.scm b/disfluid/maintainer/channel-code.scm index 2fba379..5b300a9 100644 --- a/disfluid/maintainer/channel-code.scm +++ b/disfluid/maintainer/channel-code.scm @@ -57,6 +57,7 @@ (gnu packages glib) (gnu packages gnupg) (gnu packages gtk) + (gnu packages tls) (guix git-download) (guix monads) (guix store) @@ -114,7 +115,8 @@ '(guile-hall gnu-gettext autoconf-archive findutils tzdata-for-tests))) (define (fix-runtime-inputs inputs) - (fix-inputs 'inputs inputs '(glib gtk-minimal bash-minimal))) + (fix-inputs 'inputs inputs + '(glib gtk-minimal bash-minimal gnutls))) (define (fix-propagated-inputs inputs) (fix-inputs 'propagated-inputs inputs '())) (define fix-field diff --git a/disfluid/maintainer/new-phases.scm b/disfluid/maintainer/new-phases.scm index 8a3003b..a3c9a73 100644 --- a/disfluid/maintainer/new-phases.scm +++ b/disfluid/maintainer/new-phases.scm @@ -185,6 +185,12 @@ DIST_DEPENDS_ON_UPDATE_PO = yes (format #f "AC_INIT([disfluid], [~a], [vivien@planete-kraus.eu]) dnl AC_INIT" ,version))))) + (add-after 'unpack 'fix-gnutls-location + (lambda* (#:key inputs #:allow-other-keys) + (let ((gnutls (search-input-file inputs "/lib/libgnutls.so"))) + (substitute* "disfluid/gnutls.scm" + (("\"libgnutls\"") + (format #f "~s" gnutls)))))) (add-after 'bootstrap 'fix-po-makefile-shell (lambda _ (substitute* "po/Makefile.in.in" @@ -247,4 +253,8 @@ dnl AC_INIT" `("GUILE_COMPILED_LOAD_PATH" prefix ,(search-path-as-list '("lib/guile/3.0/site-ccache") + (map cdr inputs))) + `("GUILE_EXTENSIONS_PATH" prefix + ,(search-path-as-list + '("lib") (map cdr inputs)))))))))) |