pyrox.dev / nixpkgs
lol
fork atom

xfce: do not use old names

volth fe70fbde ef90ff2d

+76 -76
unified split
+2 -2
pkgs/applications/window-managers/xmonad-log-applet/default.nix
··· 1 1 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib 2 2 , desktopSupport 3 3 , gtk2, gnome2_panel, GConf2 4 - , libxfce4util, xfce4panel 4 + , libxfce4util, xfce4-panel 5 5 }: 6 6 7 7 assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; ··· 23 23 ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] 24 24 # TODO: no idea where to find libpanelapplet-4.0 25 25 ++ optionals (desktopSupport == "gnome3") [ ] 26 - ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4panel ] 26 + ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] 27 27 ; 28 28 29 29 nativeBuildInputs = [ autoreconfHook pkgconfig ];
+1 -1
pkgs/desktops/xfce/applications/orage.nix
··· 16 16 nativeBuildInputs = [ pkgconfig intltool bison flex ]; 17 17 18 18 buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util 19 - xfce.xfce4panel ]; 19 + xfce.xfce4-panel ]; 20 20 21 21 preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; 22 22
+2 -2
pkgs/desktops/xfce/applications/xfce4-mixer.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, makeWrapper 2 2 , glib, gstreamer, gst-plugins-base, gtk 3 - , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null 3 + , libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null 4 4 , pulseaudioSupport ? false, gst-plugins-good 5 5 }: 6 6 ··· 30 30 31 31 buildInputs = 32 32 [ pkgconfig intltool glib gstreamer gtk 33 - libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper 33 + libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper 34 34 ] ++ gst_plugins; 35 35 36 36 postInstall =
+2 -2
pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup 1 + { stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup 2 2 , makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: 3 3 4 4 stdenv.mkDerivation rec { ··· 17 17 ]; 18 18 19 19 buildInputs = [ 20 - xfce4panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking 20 + xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking 21 21 ]; 22 22 23 23 meta = {
+2 -2
pkgs/desktops/xfce/core/thunar-build.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool 2 2 , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev 3 - , exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook 3 + , exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 25 25 buildInputs = [ 26 26 intltool 27 27 gtk dbus-glib libstartup_notification libnotify libexif pcre udev 28 - exo libxfce4util xfconf xfce4panel 28 + exo libxfce4util xfconf xfce4-panel 29 29 ]; 30 30 # TODO: optionality? 31 31
+3 -3
pkgs/desktops/xfce/core/thunar.nix
··· 1 - { stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-build 1 + { stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare 2 2 , thunarPlugins ? [] 3 3 }: 4 4 ··· 6 6 7 7 let 8 8 9 - build = thunar-build; 9 + build = thunar-bare; 10 10 11 11 replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: '' 12 12 exeDir="${exeDir}" ··· 50 50 } 51 51 (let 52 52 buildWithPlugins = buildEnv { 53 - name = "thunar-build-with-plugins"; 53 + name = "thunar-bare-with-plugins"; 54 54 paths = [ build ] ++ thunarPlugins; 55 55 }; 56 56
+2 -2
pkgs/desktops/xfce/core/xfce4-panel.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui 2 2 , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification 3 - , makeWrapper, xfce4mixer, hicolor-icon-theme 3 + , makeWrapper, xfce4-mixer, hicolor-icon-theme 4 4 , withGtk3 ? false, gtk3, gettext, glib-networking 5 5 }: 6 6 let ··· 31 31 buildInputs = 32 32 [ pkgconfig intltool gtk libxfce4util exo libwnck 33 33 garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme 34 - ] ++ xfce4mixer.gst_plugins 34 + ] ++ xfce4-mixer.gst_plugins 35 35 ++ optional withGtk3 gtk3; 36 36 37 37 propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ];
+2 -2
pkgs/desktops/xfce/core/xfce4-power-manager.nix
··· 1 1 { stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf 2 - , libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor-icon-theme 2 + , libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme 3 3 , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }: 4 4 let 5 5 p_name = "xfce4-power-manager"; ··· 23 23 ] ++ 24 24 (if withGtk3 25 25 then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ] 26 - else [ gtk libxfce4ui xfce4panel ]); 26 + else [ gtk libxfce4ui xfce4-panel ]); 27 27 28 28 postPatch = lib.optionalString withGtk3 '' 29 29 substituteInPlace configure --replace gio-2.0 gio-unix-2.0
+2 -2
pkgs/desktops/xfce/core/xfce4-session.nix
··· 1 1 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit 2 - , libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus-glib, xfconf, libglade, xorg 2 + , libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg 3 3 , hicolor-icon-theme 4 4 }: 5 5 ··· 23 23 24 24 buildInputs = 25 25 [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib 26 - xfconf xfce4panel libglade xorg.iceauth xorg.libSM 26 + xfconf xfce4-panel libglade xorg.iceauth xorg.libSM 27 27 polkit hicolor-icon-theme 28 28 ]; #TODO: upower-glib, gconf (assistive?), gnome keyring 29 29
+2 -2
pkgs/desktops/xfce/core/xfdesktop.nix
··· 1 1 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui 2 - , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify 2 + , libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify 3 3 , hicolor-icon-theme }: 4 4 let 5 5 p_name = "xfdesktop"; ··· 16 16 17 17 buildInputs = [ 18 18 pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf 19 - libglade xfce4panel thunar exo garcon libnotify hicolor-icon-theme 19 + libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme 20 20 ]; 21 21 22 22 patches = [(fetchpatch {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; 18 18 19 19 meta = {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; 18 18 19 19 meta = {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 15 15 16 16 nativeBuildInputs = [ pkgconfig intltool ]; 17 17 18 - buildInputs = [ libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 18 + buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 19 19 20 20 enableParallelBuilding = true; 21 21
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; 16 + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; 17 17 preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; 18 18 19 19 meta = {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4panel 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel 2 2 , gtk }: 3 3 4 4 with stdenv.lib; ··· 15 15 }; 16 16 17 17 nativeBuildInputs = [ pkgconfig ]; 18 - buildInputs = [ intltool libxfce4util libxfcegui4 xfce4panel gtk ]; 18 + buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ]; 19 19 20 20 meta = { 21 21 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 18 18 meta = { 19 19 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+1 -1
pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
··· 16 16 17 17 nativeBuildInputs = [ pkgconfig ]; 18 18 buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ] 19 - ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ]) 19 + ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) 20 20 ++ pythonPath; 21 21 22 22 postPatch = ''
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 18 18 meta = { 19 19 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 18 18 meta = { 19 19 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 18 18 meta = { 19 19 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 18 18 meta = { 19 19 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, 2 - libgtop, libxfce4ui, libxfce4util, xfce4panel, lm_sensors 2 + libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 25 25 libgtop 26 26 libxfce4ui 27 27 libxfce4util 28 - xfce4panel 28 + xfce4-panel 29 29 lm_sensors 30 30 ]; 31 31
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, 2 2 libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }: 3 3 4 4 with stdenv.lib; ··· 14 14 name = "${p_name}-${ver_maj}.${ver_min}"; 15 15 16 16 nativeBuildInputs = [ pkgconfig ]; 17 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel 17 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel 18 18 libxfcegui4 xfconf gtk exo gnutls libgcrypt ]; 19 19 20 20 meta = {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, 2 2 libxfcegui4, xfconf, gtk, exo }: 3 3 4 4 with stdenv.lib; ··· 14 14 }; 15 15 16 16 nativeBuildInputs = [ pkgconfig ]; 17 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel 17 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel 18 18 libxfcegui4 xfconf gtk exo ]; 19 19 20 20 meta = {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
··· 1 - { stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4panel }: 1 + { stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4-panel }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 ver = "0.3.1"; ··· 13 13 }; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4panel ]; 16 + buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ]; 17 17 18 18 postPatch = '' 19 19 substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; 17 17 preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; 18 18 19 19 meta = {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ]; 17 17 18 18 meta = { 19 19 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, 2 - libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu 2 + libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 22 22 gnome2.gtk 23 23 libxfce4ui 24 24 libxfce4util 25 - xfce4panel 25 + xfce4-panel 26 26 libnotify 27 27 lm_sensors 28 28 hddtemp
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}: 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk}: 2 2 3 3 with stdenv.lib; 4 4 stdenv.mkDerivation rec { ··· 13 13 name = "${p_name}-${ver_maj}.${ver_min}"; 14 14 15 15 nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel gtk ]; 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk ]; 17 17 18 18 meta = { 19 19 homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel 2 2 , libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: 3 3 4 4 with stdenv.lib; ··· 13 13 }; 14 14 name = "${p_name}-${ver_maj}.${ver_min}"; 15 15 16 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf 16 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf 17 17 gtk hicolor-icon-theme ]; 18 18 19 19 nativeBuildInputs = [ pkgconfig ];
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre 2 - , libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }: 2 + , libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk }: 3 3 4 4 with stdenv.lib; 5 5 stdenv.mkDerivation rec { ··· 14 14 name = "${p_name}-${ver_maj}.${ver_min}"; 15 15 16 16 nativeBuildInputs = [ pkgconfig ]; 17 - buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; 17 + buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; 18 18 19 19 hardeningDisable = [ "format" ]; 20 20
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower, 2 - libxfce4ui, libxfce4util, xfce4panel }: 2 + libxfce4ui, libxfce4util, xfce4-panel }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "${p_name}-${ver_maj}.${ver_min}"; ··· 15 15 nativeBuildInputs = [ pkgconfig intltool ]; 16 16 17 17 buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util 18 - xfce4panel ]; 18 + xfce4-panel ]; 19 19 20 20 enableParallelBuilding = true; 21 21
+3 -3
pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
··· 1 1 { stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4 2 - , xfce4panel, gtk, exo, garcon }: 2 + , xfce4-panel, gtk, exo, garcon }: 3 3 4 4 with stdenv.lib; 5 5 stdenv.mkDerivation rec { ··· 17 17 18 18 nativeBuildInputs = [ cmake pkgconfig intltool ]; 19 19 20 - buildInputs = [ libxfce4util libxfcegui4 xfce4panel gtk exo garcon ]; 20 + buildInputs = [ libxfce4util libxfcegui4 xfce4-panel gtk exo garcon ]; 21 21 22 22 enableParallelBuilding = true; 23 23 24 24 preFixup = '' 25 25 substituteInPlace $out/bin/xfce4-popup-whiskermenu \ 26 - --replace $out/bin/xfce4-panel ${xfce4panel.out}/bin/xfce4-panel 26 + --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel 27 27 ''; 28 28 29 29 meta = {
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
··· 1 1 { stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 2 - , exo, libxfce4ui, libxfce4util, xfce4panel, xfconf, xfce4_dev_tools }: 2 + , exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 p_name = "xfce4-windowck-plugin"; ··· 15 15 16 16 nativeBuildInputs = [ pkgconfig ]; 17 17 buildInputs = [ intltool python3 imagemagick libwnck gtk2 18 - exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ]; 18 + exo libxfce4ui libxfce4util xfce4-panel xfconf xfce4-dev-tools ]; 19 19 20 20 preConfigure = '' 21 21 ./autogen.sh
+2 -2
pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel 1 + { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4-panel 2 2 , garcon, gtk, libxklavier, librsvg, libwnck 3 3 }: 4 4 ··· 16 16 }; 17 17 18 18 nativeBuildInputs = [ pkgconfig ]; 19 - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel garcon 19 + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel garcon 20 20 gtk libxklavier librsvg libwnck ]; 21 21 22 22 meta = {
+2 -2
pkgs/desktops/xfce/thunar-plugins/archive/default.nix
··· 1 - { stdenv, fetchFromGitHub, pkgconfig, xfce4_dev_tools 1 + { stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools 2 2 , gtk 3 3 , thunarx-2-dev 4 4 , exo, libxfce4util, libxfce4ui ··· 20 20 21 21 nativeBuildInputs = [ pkgconfig ]; 22 22 buildInputs = [ 23 - xfce4_dev_tools 23 + xfce4-dev-tools 24 24 thunarx-2-dev 25 25 exo gtk libxfce4util libxfce4ui 26 26 xfconf udev libnotify
+1 -1
pkgs/misc/screensavers/light-locker/default.nix
··· 29 29 patches = [ ./systemd.patch ]; 30 30 31 31 nativeBuildInputs = [ pkgconfig ]; 32 - buildInputs = [ which xfce.xfce4_dev_tools glib systemd 32 + buildInputs = [ which xfce.xfce4-dev-tools glib systemd 33 33 libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ]; 34 34 35 35 preConfigure = ''
+3 -3
pkgs/top-level/all-packages.nix
··· 18456 18456 18457 18457 xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet { 18458 18458 desktopSupport = "gnome2"; 18459 - inherit (xfce) libxfce4util xfce4panel; 18459 + inherit (xfce) libxfce4util xfce4-panel; 18460 18460 gnome2_panel = gnome2.gnome_panel; 18461 18461 GConf2 = gnome2.GConf; 18462 18462 }; 18463 18463 18464 18464 xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet { 18465 18465 desktopSupport = "gnome3"; 18466 - inherit (xfce) libxfce4util xfce4panel; 18466 + inherit (xfce) libxfce4util xfce4-panel; 18467 18467 gnome2_panel = gnome2.gnome_panel; 18468 18468 GConf2 = gnome2.GConf; 18469 18469 }; 18470 18470 18471 18471 xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet { 18472 18472 desktopSupport = "xfce4"; 18473 - inherit (xfce) libxfce4util xfce4panel; 18473 + inherit (xfce) libxfce4util xfce4-panel; 18474 18474 gnome2_panel = gnome2.gnome_panel; 18475 18475 GConf2 = gnome2.GConf; 18476 18476 };