Author: eelco
Date: Mon Aug 22 22:51:23 2011
New Revision: 28761
URL: https://svn.nixos.org/websvn/nix/?rev=28761&sc=1
Log:
* Xfce 4.8.
Added:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/
- copied from r28757, nixpkgs/trunk/pkgs/desktops/xfce-4.6/
Deleted:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4menu.nix
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/exo.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfconf.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfwm4.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/applications/ristretto.nix Mon Aug
22 17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix Mon Aug
22 22:51:23 2011 (r28761)
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar
-, exo, dbus_glib, libxfce4util, libxfcegui4, xfconf }:
+, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }:
stdenv.mkDerivation rec {
- name = "ristretto-0.0.22";
+ name = "ristretto-0.0.93";
src = fetchurl {
- url = "http://www.xfce.org/archive/src/apps/ristretto/0.0/${name}.tar.gz";;
- sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a";
+ url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.bz2";;
+ sha1 = "c71acaad169633faffe26609f9cc671b04ff52d3";
};
buildInputs =
[ pkgconfig intltool libexif gtk thunar exo dbus_glib
- libxfce4util libxfcegui4 xfconf
+ libxfce4util libxfce4ui xfconf
];
NIX_LDFLAGS = "-lX11";
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/applications/terminal.nix Mon Aug
22 17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix Mon Aug
22 22:51:23 2011 (r28761)
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation {
- name = "xfce-terminal-0.4.5";
+ name = "xfce-terminal-0.4.8";
src = fetchurl {
- url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.5.tar.bz2;
- sha256 = "14w8mhmyrq6dd9574zfvq0pymknljckq6qgcv1r6c1r22jydrzcj";
+ url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.8.tar.bz2;
+ sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05";
};
buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ];
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix Mon Aug
22 17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix Mon Aug
22 22:51:23 2011 (r28761)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk
-, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
+, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
let
@@ -12,16 +12,16 @@
in
stdenv.mkDerivation rec {
- name = "xfce4-mixer-4.6.1";
+ name = "xfce4-mixer-4.8.0";
src = fetchurl {
- url = "http://archive.xfce.org/src/apps/xfce4-mixer/4.6/${name}.tar.bz2";;
- sha1 = "e86163782fc4fc31671c7cb212d23d34106ad3af";
+ url = "http://archive.xfce.org/src/apps/xfce4-mixer/4.8/${name}.tar.bz2";;
+ sha1 = "24f3401a68f10d2c620e354a6de98e09fe808665";
};
buildInputs =
[ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk
- libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper
+ libxfce4util libxfce4ui xfce4panel xfconf
];
postInstall =
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/exo.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/exo.nix Mon Aug 22 17:40:07
2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/exo.nix Mon Aug 22 22:51:23
2011 (r28761)
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util
-, enableHAL ? true, hal, dbus_glib }:
+{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util }:
stdenv.mkDerivation rec {
- name = "exo-0.3.107";
+ name = "exo-0.6.2";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha";
+ url = "http://archive.xfce.org/src/xfce/exo/0.6/${name}.tar.bz2";;
+ sha1 = "2486f12c814630068665e22cdf417f0f0f05dab1";
};
buildInputs =
- [ pkgconfig intltool URI glib gtk libxfce4util ] ++
- stdenv.lib.optionals enableHAL [ hal dbus_glib ];
+ [ pkgconfig intltool URI glib gtk libxfce4util ];
meta = {
homepage = http://www.xfce.org/projects/exo;
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix Mon Aug
22 17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix Mon Aug
22 22:51:23 2011 (r28761)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
stdenv.mkDerivation rec {
- name = "gtk-xfce-engine-2.6.0";
+ name = "gtk-xfce-engine-2.8.1";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha1 = "a7be2f330833d150c5fb37f68a4c2138348b5446";
+ url =
"http://archive.xfce.org/src/xfce/gtk-xfce-engine/2.8/${name}.tar.bz2";;
+ sha1 = "d7779f07cc76585be063bc25fa91e660e1fd9c97";
};
buildInputs =
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/libxfce4util.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfce4util.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool }:
stdenv.mkDerivation rec {
- name = "libxfce4util-4.6.2";
+ name = "libxfce4util-4.8.1";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";;
- sha256 = "10wcw7r8cjb0farffic037pcjr5bwrjrm8s3jrcb7c0b038pwbmf";
+ url = "http://archive.xfce.org/src/xfce/libxfce4util/4.8/${name}.tar.bz2";;
+ sha1 = "4d26aea58413603e2c163ff0374a6e32fc47bc4c";
};
buildInputs = [ pkgconfig glib intltool ];
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -2,11 +2,11 @@
, libglade, libstartup_notification }:
stdenv.mkDerivation rec {
- name = "libxfcegui4-4.6.4";
+ name = "libxfcegui4-4.8.1";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";;
- sha1 = "a12c79f8fa14c5d1fc0fca5615a451b7d23f8695";
+ url = "http://archive.xfce.org/src/xfce/libxfcegui4/4.8/${name}.tar.bz2";;
+ sha1 = "246fcaa71fc8cf44dae0b4c919411231eedd662f";
};
# By default, libxfcegui4 tries to install into libglade's prefix.
@@ -17,10 +17,12 @@
'';
buildInputs =
- [ pkgconfig intltool gtk libxfce4util xfconf libglade
+ [ pkgconfig intltool gtk libxfce4util libglade
libstartup_notification
];
+ enableParallelBuilding = true;
+
meta = {
homepage = http://www.xfce.org/;
description = "Basic GUI library for Xfce";
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/thunar.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util
-, dbus_glib, libstartup_notification, xfconf, hal, xfce4panel
-, gamin }:
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
+, dbus_glib, libstartup_notification, xfconf, xfce4panel, udev, libnotify }:
stdenv.mkDerivation rec {
- name = "thunar-1.0.2";
+ name = "thunar-1.2.2";
src = fetchurl {
- url = http://www.xfce.org/archive/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2;
- sha1 = "f7ae00c32402e4bc502aba15477b78e2c558c7c3";
+ url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-1.2.2.tar.bz2";;
+ sha1 = "314e3d53ec7be1ea578da4d842ecc8dc5958b1bd";
};
buildInputs =
- [ pkgconfig intltool exo gtk libxfce4util
- dbus_glib libstartup_notification xfconf xfce4panel gamin
+ [ pkgconfig intltool gtk exo libxfce4util libxfce4ui
+ dbus_glib libstartup_notification xfconf xfce4panel udev libnotify
];
- propagatedBuildInputs = [ hal ];
+ enableParallelBuilding = true;
meta = {
homepage = http://thunar.xfce.org/;
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/xfce-utils.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce-utils.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui }:
stdenv.mkDerivation rec {
- name = "xfce-utils-4.6.2";
+ name = "xfce-utils-4.8.2";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha1 = "6373886c3d70e576859741bde747a235567ffd8e";
+ url = "http://archive.xfce.org/src/xfce/xfce-utils/4.8/${name}.tar.bz2";;
+ sha1 = "c9358f47f57b961fc51008cf6752d2761b4c4f25";
};
- configureFlags = "--with-xsession-prefix=$(out)/share/xsessions";
+ configureFlags = "--with-xsession-prefix=$(out)/share/xsessions
--with-vendor-info=NixOS.org";
- buildInputs = [ pkgconfig intltool gtk libxfce4util libxfcegui4 ];
+ buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui ];
meta = {
homepage = http://www.xfce.org/;
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
-, libwnck, exo, libstartup_notification }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, garcon
+, libxfce4ui, xfconf, libwnck, exo }:
stdenv.mkDerivation rec {
- name = "xfce4-panel-4.6.4";
+ name = "xfce4-panel-4.8.5";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8";
+ url = "http://archive.xfce.org/src/xfce/xfce4-panel/4.8/${name}.tar.bz2";;
+ sha1 = "67b9d5bc422663f60f5a05e7cfd7ca67b4542813";
};
buildInputs =
- [ pkgconfig intltool gtk libxfce4util exo libwnck
- libstartup_notification
+ [ pkgconfig intltool gtk libxfce4util garcon libxfce4ui xfconf
+ exo libwnck
];
- propagatedBuildInputs = [ libxfcegui4 ];
+ enableParallelBuilding = true;
meta = {
homepage = http://www.xfce.org/;
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/xfce4-session.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-session.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
-, libwnck, dbus_glib, xfconf, libglade, xorg }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
+, libwnck, dbus_glib, xfconf, xorg, xfce4panel }:
stdenv.mkDerivation rec {
- name = "xfce4-session-4.6.2";
+ name = "xfce4-session-4.8.1";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b";
+ url = "http://archive.xfce.org/src/xfce/xfce4-session/4.8/${name}.tar.bz2";;
+ sha1 = "a33534e53fa36a38a1f9bd164469a9fb62c765a7";
};
buildInputs =
- [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck dbus_glib
- xfconf libglade xorg.iceauth
+ [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
+ xfconf xorg.iceauth xfce4panel
];
meta = {
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix Mon Aug
22 17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix Mon Aug
22 22:51:23 2011 (r28761)
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfcegui4
-, libglade, xfconf, xorg, libwnck, libnotify }:
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
+, xfconf, xorg, libnotify, libxklavier }:
stdenv.mkDerivation rec {
- name = "xfce4-settings-4.6.5";
+ name = "xfce4-settings-4.8.2";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha1 = "c036cc2f3100a46b2649e678dff7c0106b219263";
+ url =
"http://archive.xfce.org/src/xfce/xfce4-settings/4.8/${name}.tar.bz2";;
+ sha1 = "402afe308944a315c385d2b1ed567f997d016b61";
};
buildInputs =
- [ pkgconfig intltool exo gtk libxfce4util libxfcegui4 libglade
- xfconf xorg.libXi xorg.libXcursor libwnck libnotify
- #gtk libxfce4util libxfcegui4 libwnck dbus_glib
- #xfconf libglade xorg.iceauth
+ [ pkgconfig intltool exo gtk libxfce4util libxfce4ui
+ xfconf libnotify xorg.libXcursor libxklavier
];
+ configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
+
meta = {
homepage = http://www.xfce.org/;
description = "Settings manager for Xfce";
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfconf.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/xfconf.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfconf.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
stdenv.mkDerivation rec {
- name = "xfconf-4.6.2";
+ name = "xfconf-4.8.0";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha1 = "2b9656a1b7f323d2600ddc929191afb50c8018f8";
+ url = "http://archive.xfce.org/src/xfce/xfconf/4.8/${name}.tar.bz2";;
+ sha1 = "3f560b11d618171805bfb9e6a8290185c7ee5dcd";
};
buildInputs = [ pkgconfig intltool glib libxfce4util ];
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/xfdesktop.nix Mon Aug 22
17:40:07 2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfdesktop.nix Mon Aug 22
22:51:23 2011 (r28761)
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
-, libwnck, xfconf, libglade, libxfce4menu, xfce4panel, thunar, exo }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, libxfce4util
+, libxfce4ui, libwnck, xfconf, garcon, libnotify, exo }:
stdenv.mkDerivation rec {
- name = "xfdesktop-4.6.2";
+ name = "xfdesktop-4.8.2";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb";
+ url = "http://archive.xfce.org/src/xfce/xfdesktop/4.8/${name}.tar.bz2";;
+ sha1 = "fe7d71bb502197b0353b952947826a5a50ab13bc";
};
buildInputs =
- [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf
- libglade libxfce4menu xfce4panel thunar exo
+ [ pkgconfig intltool gtk dbus_glib libxfce4util libxfce4ui libwnck xfconf
+ garcon libnotify exo
];
+ enableParallelBuilding = true;
+
meta = {
homepage = http://www.xfce.org/;
description = "Xfce desktop manager";
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfwm4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/core/xfwm4.nix Mon Aug 22 17:40:07
2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfwm4.nix Mon Aug 22 22:51:23
2011 (r28761)
@@ -1,20 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
-, libxfcegui4, xfconf, libwnck, libstartup_notification, xorg }:
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, libxfce4util
+, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
stdenv.mkDerivation rec {
- name = "xfwm4-4.6.2";
+ name = "xfwm4-4.8.1";
src = fetchurl {
- url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";;
- sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11";
+ url = "http://archive.xfce.org/src/xfce/xfwm4/4.8/${name}.tar.bz2";;
+ sha1 = "4075a689f572ae157ed80ab3ce5be85f09dac766";
};
buildInputs =
- [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf
+ [ pkgconfig intltool gtk libxfce4util libxfce4ui xfconf
libwnck libstartup_notification
xorg.libXcomposite xorg.libXfixes xorg.libXdamage
];
+ enableParallelBuilding = true;
+
meta = {
homepage = http://www.xfce.org/;
description = "Window manager for Xfce";
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/xfce-4.6/default.nix Mon Aug 22 17:40:07
2011 (r28757)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix Mon Aug 22 22:51:23
2011 (r28761)
@@ -5,46 +5,48 @@
#### CORE
+ libxfce4util = callPackage ./core/libxfce4util.nix { };
+
exo = callPackage ./core/exo.nix {
inherit (pkgs.perlPackages) URI;
};
- libxfce4util = callPackage ./core/libxfce4util.nix { };
-
+ xfconf = callPackage ./core/xfconf.nix { };
+
libxfcegui4 = callPackage ./core/libxfcegui4.nix {
inherit (pkgs.gnome) libglade;
};
- libxfce4menu = callPackage ./core/libxfce4menu.nix { };
-
- xfconf = callPackage ./core/xfconf.nix { };
+ libxfce4ui = callPackage ./core/libxfce4ui.nix { };
xfwm4 = callPackage ./core/xfwm4.nix {
- inherit (pkgs.gnome) libglade libwnck;
+ inherit (pkgs.gnome) libwnck;
};
xfceutils = callPackage ./core/xfce-utils.nix { };
- xfce4session = callPackage ./core/xfce4-session.nix {
- inherit (pkgs.gnome) libglade libwnck;
- };
+ garcon = callPackage ./core/garcon.nix { };
- xfce4settings = callPackage ./core/xfce4-settings.nix {
- inherit (pkgs.gnome) libglade libwnck;
+ xfce4panel = callPackage ./core/xfce4-panel.nix {
+ inherit (pkgs.gnome) libwnck;
};
- xfce4panel = callPackage ./core/xfce4-panel.nix {
+ xfce4session = callPackage ./core/xfce4-session.nix {
inherit (pkgs.gnome) libwnck;
};
+ xfce4settings = callPackage ./core/xfce4-settings.nix { };
+
xfdesktop = callPackage ./core/xfdesktop.nix {
- inherit (pkgs.gnome) libwnck libglade;
+ inherit (pkgs.gnome) libwnck;
};
thunar = callPackage ./core/thunar.nix { };
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
+ # !!! Add xfce4-appfinder
+
#### APPLICATIONS
terminal = callPackage ./applications/terminal.nix {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 22 20:26:15
2011 (r28760)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 22 22:51:23
2011 (r28761)
@@ -7888,6 +7888,10 @@
(let callPackage = newScope pkgs.xfce46; in
import ../desktops/xfce-4.6 { inherit callPackage pkgs; });
+ xfce48 = recurseIntoAttrs
+ (let callPackage = newScope pkgs.xfce48; in
+ import ../desktops/xfce-4.8 { inherit callPackage pkgs; });
+
### SCIENCE
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
