diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-08 10:58:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-08 13:48:51 +0200 |
| commit | 80e4a647406433c4f737f18c9cdaa9656288fe63 (patch) | |
| tree | 3e70b3559e9d4fe1b3ff46bc8267190d01ab2ba4 /pkgs/desktops/xfce/core/xfce4-session.nix | |
| parent | 1278859d3167b9f84bfab680d9c8c463adf64a60 (diff) | |
| download | nixlib-80e4a647406433c4f737f18c9cdaa9656288fe63.tar nixlib-80e4a647406433c4f737f18c9cdaa9656288fe63.tar.gz nixlib-80e4a647406433c4f737f18c9cdaa9656288fe63.tar.bz2 nixlib-80e4a647406433c4f737f18c9cdaa9656288fe63.tar.lz nixlib-80e4a647406433c4f737f18c9cdaa9656288fe63.tar.xz nixlib-80e4a647406433c4f737f18c9cdaa9656288fe63.tar.zst nixlib-80e4a647406433c4f737f18c9cdaa9656288fe63.zip | |
xfce4session: bugfix update, superseding the patches
Diffstat (limited to 'pkgs/desktops/xfce/core/xfce4-session.nix')
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-session.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 6eeffdd5ead3..2f05f521e013 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,34 +1,26 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui, xfce4panel , libwnck, dbus_glib, xfconf, libglade, xorg -, polkit, xfce4_dev_tools }: +, polkit }: #TODO: gnome stuff: gconf (assistive?), keyring stdenv.mkDerivation rec { p_name = "xfce4-session"; ver_maj = "4.10"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv"; + sha256 = "10zwki7v55a325abr57wczcb5g7ml99cqk1p8ls8qycqqfyzlm01"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - patch_crash = fetchurl { - url = "http://git.xfce.org/xfce/xfce4-session/patch/?id=ab391138cacc62ab184a338e237c4430356b41f9"; - sha256 = "1kydj52hm883rdanpcqzf5qphj0ws2v28g8fim8jv2pm72d33day"; - }; - - patches = [ ./xfce4-session-systemd.patch patch_crash ]; - buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib xfconf xfce4panel libglade xorg.iceauth - polkit xfce4_dev_tools + polkit ]; - preConfigure = "xdt-autogen"; configureFlags = [ "--with-xsession-prefix=$(out)" ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; |