public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1205 from wizeman/xfce

Browse Source 
Xfce improvements
This commit is contained in:
Michael Raskin 2013-11-22 23:25:54 -08:00
commit 161ac7cde5
5 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/xfce/common.nix
View File

@ -68,6 +68,8 @@
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; 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 { };
xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
}; };
} }

5
pkgs/desktops/xfce/core/xfce4-session.nix
View File

@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
polkit polkit
]; ];
preBuild = ''
sed '/^PATH=/d' -i scripts/xflock4
sed '/^export PATH$/d' -i scripts/xflock4
'';
configureFlags = [ "--with-xsession-prefix=$(out)" ]; configureFlags = [ "--with-xsession-prefix=$(out)" ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";

2
pkgs/desktops/xfce/default.nix
View File

@ -56,6 +56,8 @@ 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_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 { };
xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
}; # xfce_self }; # xfce_self

23
pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix Normal file
View File

@ -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;
};
}

25
pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix Normal file
View File

@ -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;
};
}