summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-08-18 13:15:55 +0200
committerRicardo Wurmus <rekado@elephly.net>2020-08-18 13:15:55 +0200
commite4ef0d7cc915c69e1775a1c879e37559c9740ea1 (patch)
treebba42fc89e2526dcea3dea904bb08a7c1391df85
parent346ea4b5fc53ce02b5b01cb630b84e920499ac5f (diff)
downloadguix-e4ef0d7cc915c69e1775a1c879e37559c9740ea1.tar.gz
gnu: guile-gi: Install extension to sub-directory, use glib-or-gtk build system.
* gnu/packages/guile-xyz.scm (guile-gi)[build-system]: Use
glib-or-gtk-build-system.
[arguments]: Install the extension to the "extensions" sub-directory.
-rw-r--r--gnu/packages/guile-xyz.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 4526ef279d..411f11fbbc 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -104,6 +104,7 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix hg-download)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system guile)
   #:use-module (guix utils)
@@ -2706,10 +2707,10 @@ list of components.  This module takes care of that for you.")
               (sha256
                (base32
                 "05xbwrk50h4f9fh8la8fk2wsxbnm0jcyb9phnpkkjq4sqkhkxlbj"))))
-    (build-system gnu-build-system)
+    (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags '("--with-gnu-filesystem-hierarchy")
-       #:modules ((guix build gnu-build-system)
+       #:modules ((guix build glib-or-gtk-build-system)
                   (guix build utils)
                   (ice-9 popen)
                   (ice-9 rdelim))
@@ -2732,7 +2733,7 @@ list of components.  This module takes care of that for you.")
                             (format #f "~alibguile-gi"
                                     (if (getenv "GUILE_GI_UNINSTALLED")
                                         ""
-                                        ,(format #f "~a/lib/guile/~a/"
+                                        ,(format #f "~a/lib/guile/~a/extensions/"
                                                  (assoc-ref outputs "out")
                                                  effective)))
                             ,arg)))))