[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
44/49: gnu: evolution-data-server: Do not split outputs.
From: |
guix-commits |
Subject: |
44/49: gnu: evolution-data-server: Do not split outputs. |
Date: |
Sat, 4 May 2019 08:18:50 -0400 (EDT) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit fdac97f0d7190dd80f7997d703ecec5b475f0264
Author: Ricardo Wurmus <address@hidden>
Date: Sat May 4 14:13:35 2019 +0200
gnu: evolution-data-server: Do not split outputs.
A binary in $out/libexec depends on libedataserverui libraries, so the split
would require mutually recursive output dependencies.
* gnu/packages/gnome.scm (evolution-data-server)[outputs]: Remove field.
[arguments]: Remove "split" phase.
(gnome-calendar, gnome-todo, evolution)[inputs]: Adjust.
---
gnu/packages/gnome.scm | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c35afe5..6341f3c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5143,7 +5143,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(sha256
(base32
"0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv"))))
- (outputs '("out" "libedataserverui"))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
@@ -5192,28 +5191,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
;; CMakeLists.txt hard-codes runpath to just the libdir.
;; Remove it so the configure flag is respected.
(("SET\\(CMAKE_INSTALL_RPATH .*") ""))
- #t))
- (add-after 'install 'split
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (libedsui (assoc-ref outputs "libedataserverui")))
- (for-each (lambda (file)
- (mkdir-p (dirname (string-append libedsui file)))
- (rename-file (string-append out file)
- (string-append libedsui file)))
- '("/lib/pkgconfig/libedataserverui-1.2.pc"
- "/lib/libedataserverui-1.2.so"
- "/lib/libedataserverui-1.2.so.2"
- "/lib/libedataserverui-1.2.so.2.0.0"
- "/lib/girepository-1.0/EDataServerUI-1.2.typelib"
- "/include/evolution-data-server/libedataserverui"
- "/share/gir-1.0/EDataServerUI-1.2.gir"
- "/share/vala/vapi/libedataserverui-1.2.vapi"
- "/share/vala/vapi/libedataserverui-1.2.deps"))
- (substitute* (string-append libedsui "/lib/pkgconfig/"
- "libedataserverui-1.2.pc")
- ((out) libedsui))
- #t))))))
+ #t)))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection)
@@ -6693,7 +6671,7 @@ desktop. It supports world clock, stop watch, alarms,
and count down timer.")
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("libdazzle" ,libdazzle)
- ("libedataserverui" ,evolution-data-server "libedataserverui")
+ ("libedataserverui" ,evolution-data-server)
("libgweather" ,libgweather)
("geoclue" ,geoclue)))
(home-page "https://wiki.gnome.org/Apps/Calendar")
@@ -6741,7 +6719,7 @@ desktop. It supports multiple calendars, month, week and
year view.")
(inputs
`(("rest" ,rest) ; For Todoist plugin
("json-glib" ,json-glib) ; For Todoist plugin
- ("libedataserverui" ,evolution-data-server "libedataserverui")
+ ("libedataserverui" ,evolution-data-server)
("libical" ,libical)
("libpeas" ,libpeas)
("python-pygobject" ,python-pygobject)
@@ -7958,7 +7936,7 @@ generic enough to work for everyone.")
("gtkspell3" ,gtkspell3)
("highlight" ,highlight)
("libcanberra" ,libcanberra)
- ("libedataserverui" ,evolution-data-server "libedataserverui")
+ ("libedataserverui" ,evolution-data-server)
("libgweather" ,libgweather)
("libnotify" ,libnotify)
("libsoup" ,libsoup)
- 37/49: gnu: colord: Update to 1.4.3., (continued)
- 37/49: gnu: colord: Update to 1.4.3., guix-commits, 2019/05/04
- 45/49: gnu: gnome-online-accounts: Update to 3.30.0., guix-commits, 2019/05/04
- 41/49: gnu: yelp-xsl: Update to 3.30.1., guix-commits, 2019/05/04
- 38/49: gnu: eog: Update to 3.28.4., guix-commits, 2019/05/04
- 39/49: gnu: epiphany: Update to 3.30.2., guix-commits, 2019/05/04
- 40/49: gnu: yelp: Update to 3.30.0., guix-commits, 2019/05/04
- 42/49: gnu: libgnome-games-support: Update to 1.4.2., guix-commits, 2019/05/04
- 49/49: gnu: gnome-shell: Update to 3.30.2., guix-commits, 2019/05/04
- 33/49: gnu: libgdata: Update to 0.17.9., guix-commits, 2019/05/04
- 47/49: gnu: gtksourceview: Update to 4.0.3., guix-commits, 2019/05/04
- 44/49: gnu: evolution-data-server: Do not split outputs.,
guix-commits <=
- 43/49: gnu: evolution-data-server: Update to 3.30.2., guix-commits, 2019/05/04