From 208d1f24db9966c18e1a3aca3b99ec4eae362607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 12 Mar 2015 22:52:38 +0100 Subject: [PATCH] xfce: more update fallout - forgotten mousepad update, including some wrapping magic - dealing with panel plugins (either fix or mark as broken) CC maintainer @AndersonTorres. - remove some libxfcegui4 occurrences, as it's being phased out - minor stuff --- .../services/x11/desktop-managers/xfce.nix | 1 - pkgs/desktops/xfce/applications/mousepad.nix | 20 ++++++++++--------- pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 4 ++-- .../panel-plugins/xfce4-cpufreq-plugin.nix | 6 +++--- .../panel-plugins/xfce4-cpugraph-plugin.nix | 4 ++-- .../xfce/panel-plugins/xfce4-dict-plugin.nix | 1 + .../xfce/panel-plugins/xfce4-notes-plugin.nix | 1 + .../xfce/panel-plugins/xfce4-verve-plugin.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 9 files changed, 26 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 6a14a163c19..fce5bf11f05 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -46,7 +46,6 @@ in pkgs.which # Needed by the xfce's xinitrc script. pkgs.xfce.exo pkgs.xfce.gtk_xfce_engine - pkgs.xfce.libxfcegui4 # For the icons. pkgs.xfce.mousepad pkgs.xfce.ristretto pkgs.xfce.terminal diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 1e1ef0cf846..4d6ac29f53d 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4 -, gtk, gtksourceview, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util +, gtk, gtksourceview, dbus, dbus_glib, makeWrapper }: stdenv.mkDerivation rec { p_name = "mousepad"; - ver_maj = "0.3"; + ver_maj = "0.4"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; + sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132"; }; name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libxfce4util libxfcegui4 - gtk gtksourceview dbus dbus_glib + [ pkgconfig intltool libxfce4util + gtk gtksourceview dbus dbus_glib makeWrapper ]; - # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax - # highlighting (in fact Mousepad segfaults without it). - propagatedUserEnvPkgs = [ gtksourceview ]; + preFixup = '' + wrapProgram "$out/bin/mousepad" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" + ''; meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index de95caddff1..b66faf2390b 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; ver_maj = "2.10"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0rqrnjxx1lzla7wp2fadyixs6jy0js6xh005pgwyqbigpl0v7hy1"; + sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index f2a8ef4d9ea..072da2bc576 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-cpufreq-plugin"; - ver_maj = "1.0"; - ver_min = "0"; + ver_maj = "1.1"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1"; + sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index ad9c45820af..7aca910b8a8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index ede0495b8de..3be77ab77ca 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Dictionary plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 8e402edbeb6..eba05af69c0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index e73ad925630..603a68cc5f6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre -, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }: with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-verve-plugin"; ver_maj = "1.0"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "18zi8lam82xwjm5zdnilg3ffxpp5z8vjad3kjvdsyxdhsdza84fh"; + sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f813179e7df..657f3ac44c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12962,8 +12962,8 @@ let kde5 = kf5_stable // plasma5_stable // kdeApps_stable; - xfce = xfce4_10; - xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); + xfce = xfce4-12; + xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };