diff options
Diffstat (limited to 'pkgs/desktops/xfce/core/xfce4-session.nix')
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-session.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 7599826e8f02..a0568b0dd395 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,25 +1,26 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit , libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg +, hicolor_icon_theme }: -#TODO: gnome stuff: gconf (assistive?), keyring - -stdenv.mkDerivation rec { +let p_name = "xfce4-session"; ver_maj = "4.12"; ver_min = "1"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib - xfconf xfce4panel libglade xorg.iceauth - polkit - ]; + xfconf xfce4panel libglade xorg.iceauth xorg.libSM + polkit hicolor_icon_theme + ]; #TODO: upower-glib, gconf (assistive?), gnome keyring preBuild = '' sed '/^PATH=/d' -i scripts/xflock4 @@ -28,13 +29,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xsession-prefix=$(out)" ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + |