summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-10-05 14:10:00 +0300
committerEfraim Flashner <efraim@flashner.co.il>2020-10-05 14:10:00 +0300
commit31c81fefff7c3290f0a6f0b8d2c2d3855a7ba196 (patch)
treeae043f97374287ce9be10df7d8c0a293d1d68274
parentb543cbcf45ea8e15510b0df255b319df1f11d775 (diff)
downloadguix-31c81fefff7c3290f0a6f0b8d2c2d3855a7ba196.tar.gz
gnu: libsigc++: Remove duplicate definition.
* gnu/packages/glib.scm (libsigc++-2): Remove variable.
(glibmm-2.64)[propagated-inputs]: Adjust accordingly.
* gnu/packages/gtk.scm (cairomm-1.13)[propagated-inputs]: Same.
-rw-r--r--gnu/packages/glib.scm17
-rw-r--r--gnu/packages/gtk.scm2
2 files changed, 2 insertions, 17 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 06cee22603..cde95b13eb 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -619,21 +619,6 @@ It also contains adaptor classes for connection of dissimilar callbacks and
 has an ease of use unmatched by other C++ callback libraries.")
     (license license:lgpl2.1+)))
 
-(define-public libsigc++-2
-  (package
-    (inherit libsigc++)
-    (name "libsigc++")
-    (version "2.10.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "mirror://gnome/sources/libsigc++/"
-                       (version-major+minor version) "/"
-                       name "-" version ".tar.xz"))
-       (sha256
-        (base32 "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b"))))))
-
 (define glibmm
   (package
     (name "glibmm")
@@ -692,7 +677,7 @@ useful for C++.")
        (sha256
         (base32 "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"))))
      (propagated-inputs
-      `(("libsigc++" ,libsigc++-2)
+      `(("libsigc++" ,libsigc++)
         ("glib" ,glib)))))
 
 (define-public python2-pygobject-2
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ff8547d00b..e32bf7065d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1217,7 +1217,7 @@ library.")
         (base32 "1xlfl0fm5mgv53lr8xjv2kqsk3bz67qkk6qzvbrqmbvbvvbqp9wp"))))
     (propagated-inputs
      `(("cairo" ,cairo)
-       ("sigc++" ,libsigc++-2)))))
+       ("sigc++" ,libsigc++)))))
 
 (define-public pangomm
   (package