diff options
Diffstat (limited to 'pkgs/desktops')
37 files changed, 122 insertions, 101 deletions
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 9660bc3e4c78..5daf4c296012 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig , fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio -, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit +, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg -, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp +, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp , curl, libinput, systemd, mesa_noglu, writeText }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm + harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm libinput utillinux fribidi SDL2 ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index afba6e15ebdd..b37436e250be 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 -, polkit, intltool }: +, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }: + stdenv.mkDerivation rec { name = "gconf-${version}"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 libxml2 ] + buildInputs = [ ORBit2 dbus dbus-glib libxml2 ] + # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 9d71b999d11c..c15f43b542aa 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib -, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: +, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { name = "gnome-vfs-${minVer}.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus-glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 4da4c4802665..98cfc686e978 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream +, dbus-glib, telepathy-glib, telepathy-farstream , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control , telepathy-logger, libnotify, clutter, libsoup, gnutls diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index beb40209bc8c..bea40431a24e 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus , telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests - buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs + buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; + "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index d3d14f555cfa..4bd2dcbe13e8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook , webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc -, telepathy-glib, gettext, dbus_libs, icu, glib-networking +, telepathy-glib, gettext, icu, glib-networking , libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos }: diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index d46cf489620a..8f77944577ee 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: let pname = "libgnome-keyring"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib gobjectIntrospection dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; passthru = { diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b456ff6c95f1..15707575e7f3 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ config, pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { # Convert a version to branch (3.26.18 → 3.26) @@ -387,6 +387,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-packagekit = callPackage ./misc/gnome-packagekit { }; +} // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases evolution_data_server = evolution-data-server; # added 2018-02-25 diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index eed34ae523d4..47a0238a7fd5 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }: +{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }: stdenv.mkDerivation rec { name = "gnome-shell-system-monitor-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - glib_networking + glib-networking libgtop ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./paths_and_nonexisting_dirs.patch; gtop_path = "${libgtop}/lib/girepository-1.0"; - glib_net_path = "${glib_networking}/lib/girepository-1.0"; + glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index e3ff784b16fa..7bc0ee371752 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit -, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: +, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; }; - NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit - libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; + libcanberra-gtk3 libnotify dbus-glib dbus ]; prePatch = "patchShebangs meson_post_install.sh"; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 7920c8e1f458..ed162229d9af 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -2,7 +2,7 @@ , cairo , fetchurl , base, gui -, x11 +, xlibsWrapper , freetype , pkgconfig , libXmu @@ -17,7 +17,7 @@ gsmakeDerivation { sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo base gui freetype x11 libXmu ]; + buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 7563e3447504..00ebfd8a7253 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, - qttools, poppler_qt5, wrapGAppsHook + qttools, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras - poppler_qt5 + poppler fluxbox xscreensaver desktop-file-utils diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index c4b2366e7870..0d69d4d2f32b 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }: + +assert withGtk3 -> (gtk3 != null); stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; @@ -12,8 +14,11 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3; - + buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3; + + # `glib-mkenums' is unhappy that some source files are not valid UTF-8 + postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +''; + configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; meta = { diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 67580c530726..abf03d4277be 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs }: +{ config, lib, pkgs }: lib.makeScope pkgs.newScope (self: with self; { #### NixOS support @@ -159,6 +159,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; }; +} // lib.optionalAttrs (config.allowAliases or true) { #### ALIASES - added 2018-01 terminal = xfce4-terminal; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index e1825d21ca7e..21705b0fb5e2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, - xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }: + xfce, libwnck3, libdbusmenu, gobjectIntrospection }: stdenv.mkDerivation rec { name = "xfce4-vala-panel-appmenu-plugin-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf - libwnck3 libdbusmenu-glib gobjectIntrospection ]; + libwnck3 libdbusmenu gobjectIntrospection ]; patches = [ (substituteAll { 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/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 db05517eb0bf..7960ee84e38e 100644 --- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix @@ -1,18 +1,30 @@ -{ mkXfceDerivation, tzdata, 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 = '' - substituteInPlace plugins/clock/clock.c \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \ - --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" "" + 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 = { 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 |