diff options
Diffstat (limited to 'pkgs/desktops/xfce4-13')
23 files changed, 95 insertions, 68 deletions
diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix index e11309135dd7..1096996ee6d5 100644 --- a/pkgs/desktops/xfce4-13/exo/default.nix +++ b/pkgs/desktops/xfce4-13/exo/default.nix @@ -1,12 +1,12 @@ -{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3 +{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation rec { category = "xfce"; pname = "exo"; - version = "0.11.5"; + version = "0.12.2"; - sha256 = "0zxv7cx1xbjls7q2blv8ir9zwzyq7r189n6q35jwasns7rxj256v"; + sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh"; nativeBuildInputs = [ libxslt perlPackages.URI ]; buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; @@ -14,7 +14,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/reference/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; meta = { diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix index 63df0b7cc9ad..51f5fca8d1a7 100644 --- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3 +{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3, libICE, libSM , libstartup_notification ? null, libxfce4util, xfconf }: mkXfceDerivation rec { @@ -9,7 +9,7 @@ mkXfceDerivation rec { sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy"; buildInputs = [ gobjectIntrospection gtk2 gtk3 libstartup_notification xfconf ]; - propagatedBuildInputs = [ libxfce4util ]; + propagatedBuildInputs = [ libxfce4util libICE libSM ]; meta = with lib; { description = "Widgets library for Xfce"; diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix index 091d73bf72a4..fe9974ca573b 100644 --- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix +++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4util"; - version = "4.13.1"; + version = "4.13.2"; - sha256 = "001ls90an2pi9l04g3r6syfa4lhyvjymp0r9djxrkc2q493mcv3d"; + sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98"; buildInputs = [ gobjectIntrospection ]; diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix index 6a2f37cbef67..3857846ea82d 100644 --- a/pkgs/desktops/xfce4-13/orage/default.nix +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null +{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null , popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; @@ -15,4 +15,13 @@ mkXfceDerivation rec { sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; buildInputs = [ dbus_glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; + + patches = [ + # Fix build with libical 3.0 + (fetchpatch { + name = "fix-libical3.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f; + sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; + }) + ]; } diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix index c1976727c048..e720791f1c47 100644 --- a/pkgs/desktops/xfce4-13/parole/default.nix +++ b/pkgs/desktops/xfce4-13/parole/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus_glib +{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus-glib , gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good , gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util , taglib ? null, xfconf }: @@ -8,9 +8,9 @@ mkXfceDerivation rec { category = "apps"; pname = "parole"; - version = "0.9.2"; + version = "1.0.1"; - sha256 = "07i9d7xn2ys3z71sxvr53idq4ivy94pqgxvr0k78crva39ls08s5"; + sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ @@ -21,7 +21,7 @@ mkXfceDerivation rec { buildInputs = [ dbus - dbus_glib + dbus-glib gst-plugins-bad gst-plugins-base gst-plugins-good diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix index 5296723eb401..b4b0778e9824 100644 --- a/pkgs/desktops/xfce4-13/ristretto/default.nix +++ b/pkgs/desktops/xfce4-13/ristretto/default.nix @@ -1,10 +1,10 @@ -{ mkXfceDerivation, automakeAddFlags, exo, dbus_glib, gtk2, libexif +{ mkXfceDerivation, automakeAddFlags, exo, dbus-glib, gtk2, libexif , libxfce4ui, libxfce4util, xfconf }: mkXfceDerivation rec { category = "apps"; pname = "ristretto"; - version = "0.8.2"; + version = "0.8.3"; postPatch = '' automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS @@ -12,7 +12,7 @@ mkXfceDerivation rec { ''; nativeBuildInputs = [ automakeAddFlags exo ]; - buildInputs = [ dbus_glib gtk2 libexif libxfce4ui libxfce4util xfconf ]; + buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ]; - sha256 = "0ra50452ldk91pvhcpl3f3rhdssw3djfr6cm0hc29v8r58am0wni"; + sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx"; } diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix index 7503e67e4a56..dbeb80ac9bd2 100644 --- a/pkgs/desktops/xfce4-13/thunar/default.nix +++ b/pkgs/desktops/xfce4-13/thunar/default.nix @@ -1,17 +1,17 @@ -{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null +{ mkXfceDerivation, docbook_xsl, exo, gdk_pixbuf, gtk3, libgudev ? null , libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }: mkXfceDerivation rec { category = "xfce"; pname = "thunar"; - version = "1.7.0"; + version = "1.8.1"; - sha256 = "1s262hii524a5hb15pb8xbrrrhyi5fj3837zgbscg3rdnsm52igw"; + sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha"; postPatch = '' substituteInPlace docs/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; nativeBuildInputs = [ libxslt ]; diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix index 6bcdbfbc41e3..15b41f090af5 100644 --- a/pkgs/desktops/xfce4-13/tumbler/default.nix +++ b/pkgs/desktops/xfce4-13/tumbler/default.nix @@ -6,9 +6,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "tumbler"; - version = "0.2.0"; + version = "0.2.1"; - sha256 = "0jr6rhgc57yqb3iwp7y49yf5ig541liaz6xpvjl45ki34j091iaj"; + sha256 = "0vgk3s6jnsrs8bawrfc11s8nwsm4jvcl3aidbaznk52g97xiyxz0"; buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ]; } diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix index 266722c9b053..e5898687098a 100644 --- a/pkgs/desktops/xfce4-13/xfburn/default.nix +++ b/pkgs/desktops/xfce4-13/xfburn/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: +{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: mkXfceDerivation rec { category = "apps"; @@ -8,7 +8,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix index ab64acee0504..9dedb8674dc2 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }: +{ mkXfceDerivation, autoreconfHook, autoconf, automake +, glib, gtk-doc, intltool, libtool }: mkXfceDerivation rec { category = "xfce"; @@ -13,7 +14,7 @@ mkXfceDerivation rec { autoconf automake glib - gtk_doc + gtk-doc intltool libtool ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix index a5357ebd5901..1236b60175d0 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-dict"; - version = "0.8.0"; + version = "0.8.1"; - sha256 = "1r1k9cgl7zkn3q4mjf7qjql6vlxkb2m0spgj9p646mw7bnhbf9wr"; + sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf"; patches = [ ./configure-gio.patch ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix index 96deb96e7f7d..76cb22b5b5f5 100644 --- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2 +{ mkXfceDerivation, automakeAddFlags, dbus-glib, gst-plugins-base, gtk2 , libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation rec { @@ -16,7 +16,7 @@ mkXfceDerivation rec { ''; buildInputs = [ - dbus_glib + dbus-glib gst-plugins-base gtk2 libICE diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix index b4be0a35a130..bac258785079 100644 --- a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix @@ -1,13 +1,12 @@ -{ mkXfceDerivation, dbus_glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util +{ mkXfceDerivation, dbus-glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util , xfce4-panel, xfconf }: mkXfceDerivation rec { category = "apps"; pname = "xfce4-notifyd"; - version = "0.4.1"; + version = "0.4.2"; - sha256 = "12mqi0q1hcjm16f4pndq7l58h2n0nq160r5fqx8ns320i83nh94k"; + sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9"; - nativeBuildInputs = [ dbus_glib exo ]; - buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix index 88ba2de49be0..7960ee84e38e 100644 --- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix @@ -1,14 +1,32 @@ -{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: +{ mkXfceDerivation, makeWrapper, exo, garcon, gtk2, gtk3, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf }: mkXfceDerivation rec { category = "xfce"; pname = "xfce4-panel"; - version = "4.13.2"; + version = "4.13.3"; - sha256 = "194pihmg7af4x81nia2fy3h7rls306a7c0bqny9ycqikvi6nmdmn"; + sha256 = "00b2b16wqwzdbh1vsnpl2kasa7f9i1hr1wkkjmvzmy2v7bmkygr0"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; + patches = [ ../../xfce/core/xfce4-panel-datadir.patch ]; + patchFlags = "-p1"; + + postPatch = '' + for f in $(find . -name \*.sh); do + substituteInPlace $f --replace gettext ${gettext}/bin/gettext + done + ''; + + configureFlags = [ "--enable-gtk3" ]; + + postInstall = '' + wrapProgram "$out/bin/xfce4-panel" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" + ''; + meta = { description = "Xfce's panel"; }; diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix index bf998d2e8190..5389af668820 100644 --- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-power-manager"; - version = "1.6.0"; + version = "1.6.1"; - sha256 = "1sh6ydn44j1yki8f020ljayp1fjcigkywcvjp38fsk7j25ni2wrp"; + sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; @@ -14,6 +14,6 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS - automakeAddFlags src/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS + automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS ''; } diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix index 5e2c296f056b..0dfad21d07ba 100644 --- a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix @@ -1,11 +1,12 @@ -{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel }: +{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, wrapGAppsHook, glib-networking }: mkXfceDerivation rec { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.1"; + version = "1.9.2"; - sha256 = "1q13hvaz3ykrbgbbqb1186mhri8r9hkmpaayjwhnkvjm7jfyhbin"; + sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2"; - buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel ]; + nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system" + buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix index 235c5cd15e42..d08c1f96fdd4 100644 --- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix @@ -1,13 +1,13 @@ -{ mkXfceDerivation, automakeAddFlags, dbus_glib, exo, garcon, gtk3 +{ mkXfceDerivation, automakeAddFlags, dbus-glib, exo, garcon, gtk3 , libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null , upower ? null, xfconf, xf86inputlibinput ? null }: mkXfceDerivation rec { category = "xfce"; pname = "xfce4-settings"; - version = "4.13.1"; + version = "4.13.4"; - sha256 = "010vcgy3qiqykk174jhf50a8q3x4a5qq2lf6b0wcbyzv7aikydrw"; + sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy"; postPatch = '' automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS @@ -19,7 +19,7 @@ mkXfceDerivation rec { nativeBuildInputs = [ automakeAddFlags ]; buildInputs = [ - dbus_glib + dbus-glib exo garcon gtk3 diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix index c2d80e31f150..d9a5991598bc 100644 --- a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix @@ -7,9 +7,9 @@ in mkXfceDerivation rec { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.2.0"; + version = "1.2.1"; - sha256 = "1lx66lhzfzhysymcbzfq9nrafyfmwdb79lli9kvhz6m12dhz6j18"; + sha256 = "1p0496r1fb5zqvn6c41kb6rjqwlqghqahgg6hkzw0gjy911im99w"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk2 gtk3 libwnck3 libXmu ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix index de37e4071fec..5ee6e338ea4b 100644 --- a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.6"; + version = "0.8.7.4"; - sha256 = "1a0b2ih552zhbbx1fc5ad80nafvkc5my3gw89as4mvycnhyd5inj"; + sha256 = "1s1dq560icg602jjb2ja58x7hxg4ikp3jrrf74v3qgi0ir950k2y"; buildInputs = [ gtk3 libxfce4ui vte ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix index e7f13e104c83..626451c70d63 100644 --- a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix @@ -1,13 +1,13 @@ -{ lib, mkXfceDerivation, gtk2, libnotify ? null, libpulseaudio, keybinder, xfconf }: +{ lib, mkXfceDerivation, gtk3, libnotify ? null, libpulseaudio, keybinder3, xfconf }: mkXfceDerivation rec { category = "apps"; pname = "xfce4-volumed-pulse"; - version = "0.2.2"; + version = "0.2.3"; - sha256 = "0ccb98b433lx5fgdqd3nqqppg4sldr5p1is6pnx85h9wyxx5svhp"; + sha256 = "1rsjng9qmq7vzrx5bfxq76h63y501cfl1mksrxkf1x39by9r628j"; - buildInputs = [ gtk2 libnotify libpulseaudio keybinder xfconf ]; + buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; meta = with lib; { license = licenses.gpl3Plus; diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix index 8280922d1c74..def60bcfe21c 100644 --- a/pkgs/desktops/xfce4-13/xfconf/default.nix +++ b/pkgs/desktops/xfce4-13/xfconf/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfconf"; - version = "4.13.4"; + version = "4.13.5"; - sha256 = "1bm4q06rwlmkmcy6qnwm6l70w6749iqfrmsrgj3y1jb2sacc3pd4"; + sha256 = "0xpnwb04yw5qdn0bj8b740a7rmiy316vhja5pp8p6sdiqm32yi8a"; buildInputs = [ libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix index 7ce32424b9bd..0209b7913602 100644 --- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix +++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfdesktop"; - version = "4.13.1"; + version = "4.13.2"; - sha256 = "0idc8j44apflvdasnvj7ld0fa8mxlwpndfqzbh97w54s8972gf6g"; + sha256 = "0v6dlhraqh9v20qciyj03cbjmg3jb6gvmf0hqzavxqi2di3mv5fl"; buildInputs = [ exo diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix index d5de68173009..97d414d66932 100644 --- a/pkgs/desktops/xfce4-13/xfwm4/default.nix +++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix @@ -1,6 +1,6 @@ -{ mkXfceDerivation, exo, dbus_glib, epoxy ? null, gtk2, libICE, libSM -, libstartup_notification ? null, libxfce4ui, libxfce4util, libwnck -, libXpresent ? null, xfconf }: +{ mkXfceDerivation, exo, dbus-glib, epoxy, gtk2, libXdamage +, libstartup_notification, libxfce4ui, libxfce4util, libwnck +, libXpresent, xfconf }: mkXfceDerivation rec { category = "xfce"; @@ -12,11 +12,10 @@ mkXfceDerivation rec { nativeBuildInputs = [ exo ]; buildInputs = [ - dbus_glib + dbus-glib epoxy gtk2 - libICE - libSM + libXdamage libstartup_notification libxfce4ui libxfce4util |