guix-commits
[Top][All Lists]
Advanced

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

02/03: gnu: bitlbee-discord: Fix build.


From: guix-commits
Subject: 02/03: gnu: bitlbee-discord: Fix build.
Date: Wed, 14 Jul 2021 09:04:45 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit a6a4d4b843e8fcf35009ca556d9ed25a700b52d5
Author: Adrian Fullmer <adrianfullmer@yahoo.com>
AuthorDate: Sat Mar 14 11:59:58 2020 -0500

    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 <maxim.cournoyer@gmail.com>
---
 gnu/packages/messaging.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 22e1c37..55c12c8 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)



reply via email to

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