diff options
Diffstat (limited to 'pkgs/desktops/xfce')
13 files changed, 25 insertions, 44 deletions
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 2c99bad8156..72d8e682c86 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata -, libnotify, popt, xfce -}: +, libnotify, popt, xfce, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; @@ -35,8 +34,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4-panel ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; - meta = { homepage = http://www.xfce.org/projects/; description = "A simple calendar application with reminders"; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index a0856b6a6d7..19ecff29093 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libnotify -, gtk , libxfce4util, libxfce4ui, xfconf }: +, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "xfce4-notifyd"; @@ -13,10 +13,9 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; + buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ]; preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache # to be able to run the daemon we need it in PATH ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin ''; diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index 5f8cc71de85..0b606ee5fdd 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev -, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook +, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { intltool gtk dbus-glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4-panel + hicolor-icon-theme ]; # TODO: optionality? enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index a3b8a619f17..39214ca57b1 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, xfconf, udev, libgudev, libnotify }: +, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "thunar-volman"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util - xfconf libnotify + xfconf libnotify hicolor-icon-theme ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix index c64e8770d25..6399aa3cc20 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index 236c71c66d5..cb32d567643 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index 0a309c433e9..07838f8fe7c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; + buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "CPU Freq load plugin for Xfce panel"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index c5487198f97..8048a857029 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, xfce4-panel, libxfce4ui, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix index a843f0223c4..e82669cc1a3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix index 1b963237c02..6f6f5699b6e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf -, gtk3, libpulseaudio +, gtk3, libpulseaudio, hicolor-icon-theme , withKeybinder ? true, keybinder3 , withLibnotify ? true, libnotify }: @@ -21,12 +21,10 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio ] + buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ] ++ optional withKeybinder keybinder3 ++ optional withLibnotify libnotify; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Adjust the audio volume of the PulseAudio sound system"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 03f062532ea..15cd526d6de 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower, -libxfce4ui, libxfce4util, xfce4-panel }: +libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util - xfce4-panel ]; + xfce4-panel hicolor-icon-theme ]; enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Weather plugin for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index e9c55618c60..ea3a0f08443 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -2,7 +2,7 @@ , gtk , thunar-bare , exo, libxfce4util, libxfce4ui -, xfconf, udev, libnotify +, xfconf, udev, libnotify, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { xfce4-dev-tools thunar-bare exo gtk libxfce4util libxfce4ui - xfconf udev libnotify + xfconf udev libnotify hicolor-icon-theme ]; preConfigure = '' @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { pushd $out/libexec/thunar-archive-plugin > /dev/null ln -s ./file-roller.tap org.gnome.FileRoller.tap popd > /dev/null - rm $out/share/icons/hicolor/icon-theme.cache ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 6b9aac4a8cc..b86199c5012 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , gtk -, thunar-bare, python2 +, thunar-bare, python2, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk - thunar-bare python2 + thunar-bare python2 hicolor-icon-theme ]; configurePhase = "python2 waf configure --prefix=$out"; @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { python2 waf install ''; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - enableParallelBuilding = true; meta = with stdenv.lib; { |