guix-commits
[Top][All Lists]
Advanced

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

280/377: gnu: cairomm-1.13: Fix build.


From: guix-commits
Subject: 280/377: gnu: cairomm-1.13: Fix build.
Date: Sun, 5 Sep 2021 10:08:08 -0400 (EDT)

raghavgururajan pushed a commit to branch wip-gnome
in repository guix.

commit fa3ed28ded989786d89f2f87366faeab2042117f
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Fri Mar 26 15:14:54 2021 -0400

    gnu: cairomm-1.13: Fix build.
    
    * gnu/packages/gtk.scm (cairomm-1.13)[build-system]: New field.
    [arguments]: New field.
    [propagated-inputs]: Replace libsigc++ with libsigc++-2.
    
    Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
---
 gnu/packages/gtk.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 0e39874..d595f9d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1323,9 +1323,22 @@ library.")
                        name "-" version ".tar.gz"))
        (sha256
         (base32 "1xlfl0fm5mgv53lr8xjv2kqsk3bz67qkk6qzvbrqmbvbvvbqp9wp"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/doc")
+                (string-append doc "/share/doc"))
+               #t))))))
     (propagated-inputs
-     `(("cairo" ,cairo)
-       ("sigc++" ,libsigc++)))))
+     `(("libsigc++" ,libsigc++-2)
+       ,@(package-propagated-inputs cairomm)))))
 
 (define-public pangomm
   (package



reply via email to

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