gnu: libwnck: Rename variable for GTK+ 2 variant.

* gnu/packages/gnome.scm (libwnck-1): Rename this...
  (libwnck-2): ...to this.
* gnu/packages/xfce.scm (xfce4-panel, xfce4-xkb-plugin, xfce4-session,
  xfwm4, xfdesktop)[inputs]: Adapt.
This commit is contained in:
Andreas Enge 2016-02-28 15:57:05 +01:00
parent 2236da6e97
commit dbb7a08175
2 changed files with 6 additions and 6 deletions

View File

@ -1463,7 +1463,7 @@ Hints specification (EWMH).")
(license license:lgpl2.0+))) (license license:lgpl2.0+)))
;; stable version for gtk2, required by xfwm4. ;; stable version for gtk2, required by xfwm4.
(define-public libwnck-1 (define-public libwnck-2
(package (inherit libwnck) (package (inherit libwnck)
(name "libwnck") (name "libwnck")
(version "2.30.7") (version "2.30.7")

View File

@ -283,7 +283,7 @@ management D-Bus specification.")
(inputs (inputs
`(("exo" ,exo) `(("exo" ,exo)
("garcon" ,garcon) ("garcon" ,garcon)
("libwnck" ,libwnck-1) ("libwnck" ,libwnck-2)
("libxfce4ui" ,libxfce4ui))) ("libxfce4ui" ,libxfce4ui)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
@ -407,7 +407,7 @@ keys for controlling the audio volume.")
(inputs (inputs
`(("garcon" ,garcon) `(("garcon" ,garcon)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libwnck" ,libwnck-1) ("libwnck" ,libwnck-2)
("libx11" ,libx11) ("libx11" ,libx11)
("libxfce4ui" ,libxfce4ui) ("libxfce4ui" ,libxfce4ui)
("libxklavier" ,libxklavier) ("libxklavier" ,libxklavier)
@ -488,7 +488,7 @@ your system in categories, so you can quickly find and launch them.")
("upower" ,upower) ("upower" ,upower)
("polkit" ,polkit) ("polkit" ,polkit)
("libsm" ,libsm) ("libsm" ,libsm)
("libwnck" ,libwnck-1) ("libwnck" ,libwnck-2)
("libxfce4ui" ,libxfce4ui))) ("libxfce4ui" ,libxfce4ui)))
(home-page "http://www.xfce.org/") (home-page "http://www.xfce.org/")
(synopsis "Xfce session manager") (synopsis "Xfce session manager")
@ -612,7 +612,7 @@ and import the new pictures from your camera.")
("intltool" ,intltool))) ("intltool" ,intltool)))
(inputs (inputs
`(("libdrm" ,libdrm) `(("libdrm" ,libdrm)
("libwnck" ,libwnck-1) ("libwnck" ,libwnck-2)
("libxcomposite" ,libxcomposite) ("libxcomposite" ,libxcomposite)
("libxdamage" ,libxdamage) ("libxdamage" ,libxdamage)
("libxfce4ui" ,libxfce4ui) ("libxfce4ui" ,libxfce4ui)
@ -644,7 +644,7 @@ on the screen.")
`(("exo" ,exo) `(("exo" ,exo)
("garcon" ,garcon) ("garcon" ,garcon)
("libnotify" ,libnotify) ("libnotify" ,libnotify)
("libwnck" ,libwnck-1) ("libwnck" ,libwnck-2)
("libxfce4ui" ,libxfce4ui) ("libxfce4ui" ,libxfce4ui)
("thunar" ,thunar))) ("thunar" ,thunar)))
(home-page "http://www.xfce.org/") (home-page "http://www.xfce.org/")