From 934c46183997a157fac661a2f873c231a71e953f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 Nov 2013 02:27:43 +0100 Subject: [PATCH 1/3] xfce4-xkb-plugin: Add package Allows you to setup and use multiple keyboard layouts. --- pkgs/desktops/xfce/common.nix | 1 + pkgs/desktops/xfce/default.nix | 3 ++- .../xfce/panel-plugins/xfce4-xkb-plugin.nix | 25 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix index a7e64707f91..c9d8c150565 100644 --- a/pkgs/desktops/xfce/common.nix +++ b/pkgs/desktops/xfce/common.nix @@ -68,6 +68,7 @@ xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; }; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f812336ee7f..aebbff9b7be 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -55,7 +55,8 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2" xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; }; # xfce_self diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix new file mode 100644 index 00000000000..51f30ed796e --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel +, gtk, libxklavier, librsvg, libwnck +}: + +stdenv.mkDerivation rec { + p_name = "xfce4-xkb-plugin"; + ver_maj = "0.5"; + ver_min = "4.3"; + + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0v9r0w9m5lxrzmz12f8w67l781lsywy9p1vixgn4xq6z5sxh2j6a"; + }; + + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk + libxklavier librsvg libwnck ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + description = "Allows you to setup and use multiple keyboard layouts"; + platforms = stdenv.lib.platforms.linux; + }; +} From bc05abe5c30489136eb9e34386f05d15ef8becc0 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 Nov 2013 02:52:10 +0100 Subject: [PATCH 2/3] xfce4-datetime-plugin: Add package Shows the date and time in the panel, and a calendar appears when you left-click on it. --- pkgs/desktops/xfce/common.nix | 1 + pkgs/desktops/xfce/default.nix | 1 + .../panel-plugins/xfce4-datetime-plugin.nix | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix index c9d8c150565..9f048b18c06 100644 --- a/pkgs/desktops/xfce/common.nix +++ b/pkgs/desktops/xfce/common.nix @@ -69,6 +69,7 @@ xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; }; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index aebbff9b7be..ede7ffb6c49 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -57,6 +57,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; }; # xfce_self diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix new file mode 100644 index 00000000000..267a8b77ff1 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4panel +, gtk }: + +stdenv.mkDerivation rec { + p_name = "xfce4-datetime-plugin"; + ver_maj = "0.6"; + ver_min = "1"; + + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "06xvh22y5y0bcy7zb9ylvjpcl09wdyb751r7gwyg7m3h44f0qd7v"; + }; + + buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + description = "Shows the date and time in the panel, and a calendar appears when you left-click on it"; + platforms = stdenv.lib.platforms.linux; + }; +} From fa52e46203837f9d81f561b4ea92c1e4702040ad Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 Nov 2013 04:06:42 +0100 Subject: [PATCH 3/3] xfce4-session: Don't set $PATH in xflock4 script This makes Xfce4's "Lock Screen" action button actually work when xscreensaver is installed and the daemon is running. --- pkgs/desktops/xfce/core/xfce4-session.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 2f05f521e01..a419f076b6e 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { polkit ]; + preBuild = '' + sed '/^PATH=/d' -i scripts/xflock4 + sed '/^export PATH$/d' -i scripts/xflock4 + ''; + configureFlags = [ "--with-xsession-prefix=$(out)" ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";