diff options
Diffstat (limited to 'pkgs/desktops/xfce')
5 files changed, 25 insertions, 10 deletions
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 812630e17d06..9b347715c45e 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib , libnotify, popt, xfce }: @@ -13,8 +13,17 @@ stdenv.mkDerivation rec { sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; }; + 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"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool bison flex ]; - + buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4-panel ]; 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-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index cac09d0ad35c..d18c3b8ee256 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "xfce4-hardware-monitor-plugin"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; - sha256 = "0sqvisr8gagpywq9sfyzqw37hxmj54ii89j5s2g8hx8bng5a98z1"; + sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b"; }; nativeBuildInputs = [ 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 { |