From a6a4d4b843e8fcf35009ca556d9ed25a700b52d5 Mon Sep 17 00:00:00 2001 From: Adrian Fullmer Date: Sat, 14 Mar 2020 11:59:58 -0500 Subject: gnu: bitlbee-discord: Fix build. * gnu/packages/messaging.scm (bitlbee-discord)[phases]{configure}: Delete override and move the configure flags to... [configure-flags]: ... here. Specify the '--with-bdatadir' configure flag, which resolves a build failure. Co-authored-by: Maxim Cournoyer --- gnu/packages/messaging.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 22e1c370aa..55c12c8e9a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -592,20 +592,17 @@ identi.ca and status.net).") (base32 "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "--with-bdatadir=" out "/share/bitlbee/") + (string-append "--with-plugindir=" out "/lib/bitlbee/"))) + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-autogen (lambda _ (let ((sh (which "sh"))) (substitute* "autogen.sh" (("/bin/sh") sh)) - (setenv "CONFIG_SHELL" sh)) - #t)) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "./configure" - (string-append "--with-plugindir=" - (assoc-ref outputs "out") - "/lib/bitlbee/"))))))) + (setenv "CONFIG_SHELL" sh))))))) (inputs `(("glib" ,glib))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3