~ruther/guix-local

dbb7a081756adc3262a18f1325b26adedce708bf — Andreas Enge 10 years ago 2236da6
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.
2 files changed, 6 insertions(+), 6 deletions(-)

M gnu/packages/gnome.scm
M gnu/packages/xfce.scm
M gnu/packages/gnome.scm => gnu/packages/gnome.scm +1 -1
@@ 1463,7 1463,7 @@ Hints specification (EWMH).")
    (license license:lgpl2.0+)))

;; stable version for gtk2, required by xfwm4.
(define-public libwnck-1
(define-public libwnck-2
  (package (inherit libwnck)
    (name "libwnck")
    (version "2.30.7")

M gnu/packages/xfce.scm => gnu/packages/xfce.scm +5 -5
@@ 283,7 283,7 @@ management D-Bus specification.")
    (inputs
     `(("exo" ,exo)
       ("garcon" ,garcon)
       ("libwnck" ,libwnck-1)
       ("libwnck" ,libwnck-2)
       ("libxfce4ui" ,libxfce4ui)))
    (native-search-paths
     (list (search-path-specification


@@ 407,7 407,7 @@ keys for controlling the audio volume.")
    (inputs
     `(("garcon" ,garcon)
       ("librsvg" ,librsvg)
       ("libwnck" ,libwnck-1)
       ("libwnck" ,libwnck-2)
       ("libx11" ,libx11)
       ("libxfce4ui" ,libxfce4ui)
       ("libxklavier" ,libxklavier)


@@ 488,7 488,7 @@ your system in categories, so you can quickly find and launch them.")
       ("upower" ,upower)
       ("polkit" ,polkit)
       ("libsm" ,libsm)
       ("libwnck" ,libwnck-1)
       ("libwnck" ,libwnck-2)
       ("libxfce4ui" ,libxfce4ui)))
    (home-page "http://www.xfce.org/")
    (synopsis "Xfce session manager")


@@ 612,7 612,7 @@ and import the new pictures from your camera.")
       ("intltool" ,intltool)))
    (inputs
     `(("libdrm" ,libdrm)
       ("libwnck" ,libwnck-1)
       ("libwnck" ,libwnck-2)
       ("libxcomposite" ,libxcomposite)
       ("libxdamage" ,libxdamage)
       ("libxfce4ui" ,libxfce4ui)


@@ 644,7 644,7 @@ on the screen.")
     `(("exo" ,exo)
       ("garcon" ,garcon)
       ("libnotify" ,libnotify)
       ("libwnck" ,libwnck-1)
       ("libwnck" ,libwnck-2)
       ("libxfce4ui" ,libxfce4ui)
       ("thunar" ,thunar)))
    (home-page "http://www.xfce.org/")