ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libxfce4ui: Do not propagate gtk+-2.

Browse source 
Propagation of both gtk+ and gtk+-2 causes a conflict to be detected,
preventing the installation of xfce.

* gnu/packages/xfce.scm (libxfce4ui)[propagated-inputs]: Move "gtk+-2"...
[inputs]: ...to here.
(garcon)[inputs]: Add "gtk+-2".
(xfce4-appfinder)[inputs]: Add "gtk+-2".
(xfce4-power-manager)[inputs]: Add "gtk+-2".
(ristretto)[inputs]: Add "gtk+-2".
This commit is contained in:
Ricardo Wurmus 2017-06-27 09:31:50 +02:00
parent c860d6ef23
commit b8d3a000ef
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/xfce.scm
View file

@ -159,13 +159,15 @@ (define-public libxfce4ui
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool))) ("intltool" ,intltool)))
(propagated-inputs (propagated-inputs
`(("gtk+-2" ,gtk+-2) ; required by libxfce4ui-1.pc `(("gtk+-3" ,gtk+) ; required by libxfce4ui-2.pc
("gtk+-3" ,gtk+) ; required by libxfce4ui-2.pc
;; libxfce4kbd-private-2.pc refers to all these. ;; libxfce4kbd-private-2.pc refers to all these.
("libxfce4util" ,libxfce4util) ("libxfce4util" ,libxfce4util)
("xfconf" ,xfconf))) ("xfconf" ,xfconf)))
(inputs `(("libsm" ,libsm) (inputs `(("libsm" ,libsm)
("libice" ,libice) ("libice" ,libice)
;; FIXME: required by libxfce4ui-1.pc, so should be propagated,
;; but will lead to a conflict with gtk+.
("gtk+-2" ,gtk+-2)
("startup-notification" ,startup-notification))) ("startup-notification" ,startup-notification)))
(home-page "http://www.xfce.org/") (home-page "http://www.xfce.org/")
(synopsis "Widgets library for Xfce") (synopsis "Widgets library for Xfce")
@ -221,6 +223,8 @@ (define-public garcon
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool) ("intltool" ,intltool)
("glib:bin" ,glib "bin"))) ("glib:bin" ,glib "bin")))
(inputs
`(("gtk+" ,gtk+-2)))
(propagated-inputs (propagated-inputs
`(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc `(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc
(home-page "http://www.xfce.org/") (home-page "http://www.xfce.org/")
@ -452,6 +456,7 @@ (define-public xfce4-appfinder
("intltool" ,intltool))) ("intltool" ,intltool)))
(inputs (inputs
`(("garcon" ,garcon) `(("garcon" ,garcon)
("gtk+" ,gtk+-2)
("libxfce4ui" ,libxfce4ui))) ("libxfce4ui" ,libxfce4ui)))
(home-page "http://www.xfce.org/") (home-page "http://www.xfce.org/")
(synopsis "Xfce application finder") (synopsis "Xfce application finder")
@ -759,6 +764,7 @@ (define-public xfce4-power-manager
("intltool" ,intltool))) ("intltool" ,intltool)))
(inputs (inputs
`(("lbxrandr" ,libxrandr) `(("lbxrandr" ,libxrandr)
("gtk+" ,gtk+-2)
("upower" ,upower) ("upower" ,upower)
("libnotify" ,libnotify) ("libnotify" ,libnotify)
("libxfce4ui" ,libxfce4ui))) ("libxfce4ui" ,libxfce4ui)))
@ -792,6 +798,7 @@ (define-public ristretto
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("desktop-file-utils" ,desktop-file-utils) `(("desktop-file-utils" ,desktop-file-utils)
("gtk+" ,gtk+-2)
("libexif" ,libexif) ("libexif" ,libexif)
("libxfce4ui" ,libxfce4ui) ("libxfce4ui" ,libxfce4ui)
("librsvg" ,librsvg) ("librsvg" ,librsvg)