From 5792074ddc3be1454bd6637c5246546ec022a586 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 7 Aug 2010 21:44:13 +0000
Subject: [PATCH 01/21] Add an RC (1.8.0-rc1) of SpiderMonkey by cloning the
 release expression

svn path=/nixpkgs/trunk/; revision=23030
---
 .../interpreters/spidermonkey/1.8.0-rc1.nix   | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix

diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
new file mode 100644
index 00000000000..eb384b87fe2
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, readline }:
+
+stdenv.mkDerivation rec {
+  version = "1.8.0-rc1";
+  name = "spidermonkey-${version}";
+  
+  src = fetchurl {
+    url = "http://ftp.mozilla.org/pub/mozilla.org/js/js-${version}.tar.gz";
+    sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413";
+  };
+
+  buildInputs = [ readline ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/src";
+
+  makefileExtra = ./Makefile.extra;
+  makefile = "Makefile.ref";
+  
+  patchPhase =
+    ''
+      cat ${makefileExtra} >> ${makefile}
+      sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
+    '';
+
+  makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f973c8d8d8e..d494e08aded 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2146,6 +2146,7 @@ let
   scsh = callPackage ../development/interpreters/scsh { };
 
   spidermonkey = callPackage ../development/interpreters/spidermonkey { };
+  spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
 
   sysPerl = callPackage ../development/interpreters/sys-perl { };
 

From 87cbef96cab3a3efe628d5326dac9a1084e1d263 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 7 Aug 2010 22:44:25 +0000
Subject: [PATCH 02/21] Add Veracity distributed VCS (+ issue tracker)

svn path=/nixpkgs/trunk/; revision=23031
---
 .../version-management/veracity/default.nix   | 49 +++++++++++++++++++
 .../veracity/src-for-default.nix              |  8 +++
 .../veracity/src-info-for-default.nix         |  4 ++
 .../interpreters/spidermonkey/Makefile.extra  |  3 ++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 66 insertions(+)
 create mode 100644 pkgs/applications/version-management/veracity/default.nix
 create mode 100644 pkgs/applications/version-management/veracity/src-for-default.nix
 create mode 100644 pkgs/applications/version-management/veracity/src-info-for-default.nix

diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
new file mode 100644
index 00000000000..c8cb08eef28
--- /dev/null
+++ b/pkgs/applications/version-management/veracity/default.nix
@@ -0,0 +1,49 @@
+x@{builderDefsPackage
+  , cmake, curl, patch, zlib, icu, sqlite, libuuid
+  , readline, openssl, spidermonkey_1_8_0rc1
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+    
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  phaseNames = ["prepareMakefiles" "doMake" "doDeploy"];
+
+  prepareMakefiles = a.fullDepEntry ''
+    find src -type f -exec sed -e 's@#include \([<"]\)sgbrings/js/js@#include \1js/js@g' -i '{}' ';'
+    cd ..
+    mkdir build
+    cd build
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
+    cmake -G "Unix Makefiles" -D SGBRINGS_JS_INCDIR="${spidermonkey_1_8_0rc1}/include" -D SGBRINGS_JS_LIB="${spidermonkey_1_8_0rc1}/lib/libjs.a" ../veracity*
+  '' ["minInit" "addInputs" "doUnpack"];
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out/bin" "$out/share/veracity/"
+    cp -r .. "$out/share/veracity/build-dir"
+    ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin"
+    ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin"
+  '' ["doMake" "minInit" "defEnsureDir"];
+
+  meta = {
+    description = "A distributed version control system with template-based merging";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux ;
+  };
+}) x
+
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
new file mode 100644
index 00000000000..48a6678071c
--- /dev/null
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -0,0 +1,8 @@
+rec {
+   version="0.3.0.10246";
+   name="veracity-0.3.0.10246";
+   hash="03wn6dzbjv5p50xmiznynza5c1nk38v95mzv6rk6km1ykqprnlw0";
+   url="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-0.3.0.10246.tar.gz";
+  
+}
diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix
new file mode 100644
index 00000000000..f597a59bbaf
--- /dev/null
+++ b/pkgs/applications/version-management/veracity/src-info-for-default.nix
@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  baseName = "veracity";
+}
diff --git a/pkgs/development/interpreters/spidermonkey/Makefile.extra b/pkgs/development/interpreters/spidermonkey/Makefile.extra
index 278ee7b8cc3..a764cfc69cb 100644
--- a/pkgs/development/interpreters/spidermonkey/Makefile.extra
+++ b/pkgs/development/interpreters/spidermonkey/Makefile.extra
@@ -4,4 +4,7 @@ install: $(PROGRAM) $(SHARED_LIBRARY)
 	cp -v $(PROGRAM) $(DIST)/bin
 	cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib
 	cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include
+	mkdir -pv $(DIST)/include/js
+	find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';'
+	find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';'
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d494e08aded..b4a4f07684f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6108,6 +6108,8 @@ let
     qt = qt3;
   };
 
+  veracity = callPackage ../applications/version-management/veracity {};
+
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
     inherit monotone flup cheetahTemplate highlight ctags

From 4b6b9f825679b98ce678950b2a9d0dece12434e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 14:27:43 +0000
Subject: [PATCH 03/21] * Apply a patch in vte to fix the cursor being
 invisible in xfce's   terminal application.

svn path=/nixpkgs/trunk/; revision=23037
---
 .../gnome-2.28/desktop/vte/cursor.patch       | 33 +++++++++++++++++++
 .../gnome-2.28/desktop/vte/default.nix        | 11 +++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch

diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch b/pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch
new file mode 100644
index 00000000000..c152f6b656a
--- /dev/null
+++ b/pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch
@@ -0,0 +1,33 @@
+Fix invisible cursor in xfce's terminal.
+
+http://bugzilla.xfce.org/show_bug.cgi?id=6423
+http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/vte/current/SOURCES/vte-0.25.1-cursor.patch?view=markup&pathrev=565638
+
+diff -p -up vte-0.25.1/src/vte.c.cursor vte-0.25.1/src/vte.c
+--- vte-0.25.1/src/vte.c.cursor	2010-05-03 05:28:46.000000000 -0300
++++ vte-0.25.1/src/vte.c	2010-08-03 14:06:29.000000000 -0300
+@@ -8752,6 +8752,10 @@ vte_terminal_determine_colors(VteTermina
+ 	if (highlight && !cursor && terminal->pvt->highlight_color_set) {
+ 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
+ 		*back = VTE_DEF_HL;
++	} else
++	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
++		*fore = cell ? cell->attr.back : VTE_DEF_BG;
++		*back = cell ? cell->attr.fore : VTE_DEF_FG;
+ 	} else {
+ 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
+ 		*back = cell ? cell->attr.back : VTE_DEF_BG;
+@@ -8782,13 +8786,6 @@ vte_terminal_determine_colors(VteTermina
+ 		}
+ 	}
+ 
+-	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
+-	  int tmp;
+-	  tmp = *fore;
+-	  *fore = *back;
+-	  *back = tmp;
+-	}
+-
+ 	if (!cursor && cell && cell->attr.invisible) {
+ 		*fore = *back;
+ 	}
diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix b/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
index b0f72ca7bbf..b7d93622c7d 100644
--- a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses,
-  pythonSupport ? false, python}:
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses
+, pythonSupport ? false, python}:
+
 stdenv.mkDerivation rec {
   name = "vte-0.25.1";
+  
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.25/${name}.tar.bz2";
     sha256 = "105f5ifyg09nh5p6fw2w7c0n9wd8vw9cvwlh6zg49ibsar893qi5";
   };
+
+  patches = [ ./cursor.patch ];
+  
   buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
                 stdenv.lib.optional pythonSupport python;
+                
   configureFlags = ''
     ${if pythonSupport then "--enable-python" else "--disable-python"}
   '';
+  
   meta = {
     homepage = http://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";

From 089ee5da114520b775e9d17d7c456356966c97dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 8 Aug 2010 17:26:30 +0000
Subject: [PATCH 04/21] Fix the cross-building of packages mentioned in
 stdenvLinux.overrides.

svn path=/nixpkgs/trunk/; revision=23038
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4a4f07684f..e6aef60783d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -93,8 +93,12 @@ let
   # (un-overriden) set of packages, allowing packageOverrides
   # attributes to refer to the original attributes (e.g. "foo =
   # ... pkgs.foo ...").
+  # We don't want stdenv overrides in the case of cross-building, or
+  # otherwise the basic overrided packages will not be built with the
+  # crossStdenv adapter.
   overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig //
-    (if pkgsOrig.stdenv ? overrides then pkgsOrig.stdenv.overrides else { });
+    (if (pkgsOrig.stdenv ? overrides && crossSystem == null)
+    then pkgsOrig.stdenv.overrides else { });
 
   pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides
   pkgs = pkgsFun overrides; # the overriden, final packages

From 1a6039cb4575ad13a94163264b73567b51a57f84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Aug 2010 18:51:42 +0000
Subject: [PATCH 05/21] Enable parallel building of gcc, glibc, gmp, mpfr,
 ncurses, coreutils, perl, python, git, and qt4.

If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
---
 .../git-and-tools/git/default.nix             |  4 +++-
 .../development/compilers/gcc-4.3/default.nix |  2 ++
 .../development/compilers/gcc-4.4/default.nix |  2 ++
 .../development/compilers/gcc-4.5/default.nix |  2 ++
 .../compilers/gcc-apple/default.nix           |  2 ++
 .../compilers/gcc-apple64/default.nix         |  2 ++
 .../interpreters/perl-5.10/default.nix        |  2 ++
 .../interpreters/python/2.6/default.nix       |  2 ++
 .../libraries/glibc-2.11/builder.sh           |  2 +-
 .../libraries/glibc-2.11/builder2.sh          |  2 +-
 .../libraries/glibc-2.11/common.nix           |  2 ++
 .../libraries/glibc-2.5/builder.sh            |  2 +-
 .../libraries/glibc-2.5/default.nix           |  2 ++
 pkgs/development/libraries/gmp/4.3.1.nix      |  2 ++
 pkgs/development/libraries/gmp/default.nix    |  2 ++
 pkgs/development/libraries/mpfr/default.nix   |  2 ++
 .../development/libraries/ncurses/default.nix |  4 +++-
 .../libraries/qt-4.x/4.5/default.nix          |  2 ++
 .../libraries/qt-4.x/4.6/default.nix          |  2 ++
 .../libraries/qt-4.x/4.7/default.nix          |  2 ++
 pkgs/stdenv/generic/setup.sh                  | 19 +++++++++++++++++++
 pkgs/tools/misc/coreutils/default.nix         |  2 ++
 22 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index d548f39799a..41da12cdf30 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
        '')
 
    + ''# Install man pages and Info manual
-       make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
+       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
          -C Documentation ''
 
    + (if guiSupport then ''
@@ -116,6 +116,8 @@ stdenv.mkDerivation rec {
 
      '';
 
+  enableParallelBuilding = true;
+
   meta = {
     license = "GPLv2";
     homepage = http://git-scm.com/;
diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix
index 73caa156bd0..b9d0d9bff5d 100644
--- a/pkgs/development/compilers/gcc-4.3/default.nix
+++ b/pkgs/development/compilers/gcc-4.3/default.nix
@@ -127,6 +127,8 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langFortran langVhdl langTreelang
       enableMultilib; };
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "http://gcc.gnu.org/";
     license = "GPL/LGPL";
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index bdf2e58bcb4..e4206cabd8a 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -201,6 +201,8 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
       enableMultilib version; };
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://gcc.gnu.org/;
     license = "GPLv3+";  # runtime support libraries are typically LGPLv3+
diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 39232c4988e..38f4338d4ac 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -289,6 +289,8 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
       enableMultilib version; };
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://gcc.gnu.org/;
     license = "GPLv3+";  # runtime support libraries are typically LGPLv3+
diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc-apple/default.nix
index 8006bd4426d..3346a4e327a 100644
--- a/pkgs/development/compilers/gcc-apple/default.nix
+++ b/pkgs/development/compilers/gcc-apple/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation ({
       sha256 = "a7d8041e50e110f5a503e188a05cb217f0c99c51f248a0a1387cc07a0b6f167f";
     }) ;
 
+  enableParallelBuilding = true;
+
   sourceRoot = "gcc_42-5574/";
   patches =
     [./pass-cxxcpp.patch ./debug_list.patch]
diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc-apple64/default.nix
index b87cd596a5b..ec16fae7977 100644
--- a/pkgs/development/compilers/gcc-apple64/default.nix
+++ b/pkgs/development/compilers/gcc-apple64/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation ({
       sha256 = "1fy6j41rhxdsm19sib9wygjl5l54g8pm13c6y5x13f40mavw1mma";
     }) ;
 
+  enableParallelBuilding = true;
+
   libstdcxx = "libstdcxx-39";
   sourceRoot = "gcc-5646/";
   patches =
diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl-5.10/default.nix
index 31168291e3d..76928d10448 100644
--- a/pkgs/development/interpreters/perl-5.10/default.nix
+++ b/pkgs/development/interpreters/perl-5.10/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
 
   dontAddPrefix = true;
 
+  enableParallelBuilding = true;
+
   preConfigure =
     ''
       configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 8865738b0d7..3fd035b09bb 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -88,6 +88,8 @@ stdenv.mkDerivation ( {
     libPrefix = "python${majorVersion}";
   };
 
+  enableParallelBuilding = true;
+
   meta = {
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/glibc-2.11/builder.sh b/pkgs/development/libraries/glibc-2.11/builder.sh
index f8da3b8bbe2..cbdb55b121b 100644
--- a/pkgs/development/libraries/glibc-2.11/builder.sh
+++ b/pkgs/development/libraries/glibc-2.11/builder.sh
@@ -17,7 +17,7 @@ postConfigure() {
 
 postInstall() {
     if test -n "$installLocales"; then
-        make localedata/install-locales
+        make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales
     fi
     
     test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
diff --git a/pkgs/development/libraries/glibc-2.11/builder2.sh b/pkgs/development/libraries/glibc-2.11/builder2.sh
index f156e647e0b..7d1a05131c2 100644
--- a/pkgs/development/libraries/glibc-2.11/builder2.sh
+++ b/pkgs/development/libraries/glibc-2.11/builder2.sh
@@ -20,7 +20,7 @@ postConfigure() {
 
 postInstall() {
     if test -n "$installLocales"; then
-        make localedata/install-locales
+        make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales
     fi
     
     test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix
index b792e8447e7..00d9b99cc51 100644
--- a/pkgs/development/libraries/glibc-2.11/common.nix
+++ b/pkgs/development/libraries/glibc-2.11/common.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation ({
 
   inherit (stdenv) is64bit;
 
+  enableParallelBuilding = true;
+
   patches =
     stdenv.lib.optional (fetchgit == null)
     /* Fix for NIXPKGS-79: when doing host name lookups, when
diff --git a/pkgs/development/libraries/glibc-2.5/builder.sh b/pkgs/development/libraries/glibc-2.5/builder.sh
index 695a3a1ab3d..4cd0132e370 100644
--- a/pkgs/development/libraries/glibc-2.5/builder.sh
+++ b/pkgs/development/libraries/glibc-2.5/builder.sh
@@ -38,7 +38,7 @@ postConfigure() {
 
 postInstall() {
     if test -n "$installLocales"; then
-        make localedata/install-locales
+        make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales
     fi
     rm $out/etc/ld.so.cache
     (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1
diff --git a/pkgs/development/libraries/glibc-2.5/default.nix b/pkgs/development/libraries/glibc-2.5/default.nix
index abfc3d0f439..83447d8fe8a 100644
--- a/pkgs/development/libraries/glibc-2.5/default.nix
+++ b/pkgs/development/libraries/glibc-2.5/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation {
   # the symbol __i686.get_pc_thunk.dx to be mangled.
   NIX_CFLAGS_COMPILE = "-U__i686";
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.gnu.org/software/libc/;
     description = "The GNU C Library";
diff --git a/pkgs/development/libraries/gmp/4.3.1.nix b/pkgs/development/libraries/gmp/4.3.1.nix
index 17455b9f1dd..5f83d9ae46d 100644
--- a/pkgs/development/libraries/gmp/4.3.1.nix
+++ b/pkgs/development/libraries/gmp/4.3.1.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "A free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers";
     homepage = http://gmplib.org/;
diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/default.nix
index 0b608fb4aad..ac20bc68f4d 100644
--- a/pkgs/development/libraries/gmp/default.nix
+++ b/pkgs/development/libraries/gmp/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "A free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers";
     homepage = http://gmplib.org/;
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index dea0113cc69..1bfd1448200 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.mpfr.org/;
     description = "GNU MPFR, a library for multiple-precision floating-point arithmetic";
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 344db123801..dd3d60e4812 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation ( rec {
   '';
 
   selfBuildNativeInput = true;
-    
+
+  enableParallelBuilding = true;
+
   preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
 
   # When building a wide-character (Unicode) build, create backward
diff --git a/pkgs/development/libraries/qt-4.x/4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix
index 35960c4d8ba..3b29043aeeb 100644
--- a/pkgs/development/libraries/qt-4.x/4.5/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.5/default.nix
@@ -74,6 +74,8 @@ stdenv.mkDerivation {
     ${if keepDocumentation == false then "rm -rf $out/doc" else ""}
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
     description = "A cross-platform application framework for C++";
diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix
index 9440765d830..3253e58e7c2 100644
--- a/pkgs/development/libraries/qt-4.x/4.6/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.6/default.nix
@@ -89,6 +89,8 @@ stdenv.mkDerivation rec {
 
   postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else "";
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://qt.nokia.com/products;
     description = "A cross-platform application framework for C++";
diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index 2ab7c388553..cc6d3c8d513 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -99,6 +99,8 @@ stdenv.mkDerivation rec {
 
   postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else "";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://qt.nokia.com/products;
     description = "A cross-platform application framework for C++";
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5e2fc7b24db..948b6ca3ad6 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -269,6 +269,23 @@ fi
 export NIX_INDENT_MAKE=1
 
 
+# Normalize the NIX_BUILD_CORES variable. The value might be 0, which
+# means that we're supposed to try and auto-detect the number of
+# available CPU cores at run-time.
+
+if test -z "${NIX_BUILD_CORES:-}"; then
+  NIX_BUILD_CORES="1"
+elif test "$NIX_BUILD_CORES" -le 0; then
+  NIX_BUILD_CORES=$(nproc 2>/dev/null || true)
+  if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then
+    :
+  else
+    NIX_BUILD_CORES="1"
+  fi
+fi
+export NIX_BUILD_CORES
+
+
 ######################################################################
 # Misc. helper functions.
 
@@ -603,6 +620,7 @@ buildPhase() {
 
     echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
     make ${makefile:+-f $makefile} \
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
         $makeFlags "${makeFlagsArray[@]}" \
         $buildFlags "${buildFlagsArray[@]}"
 
@@ -615,6 +633,7 @@ checkPhase() {
 
     echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
     make ${makefile:+-f $makefile} \
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
         $makeFlags "${makeFlagsArray[@]}" \
         $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check}
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index f4cf9fe9886..8052ce9fa56 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation (rec {
   # and {Open,Free}BSD.
   doCheck = (stdenv ? glibc) && (cross == null);
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;
     description = "The basic file, shell and text manipulation utilities of the GNU operating system";

From ab5669146d31b98dde484fffd30ab54d4c27ac4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 20:29:23 +0000
Subject: [PATCH 06/21] * apr 1.4.2, Apache httpd 2.2.16.

svn path=/nixpkgs/trunk/; revision=23046
---
 pkgs/development/libraries/apr/default.nix | 4 ++--
 pkgs/servers/http/apache-httpd/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 38b062e08b2..372f7fd9a2d 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.3.9";
+  name = "apr-1.4.2";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "1qicxnk62d9mjza8vch2wxy4xlq8sa76chwi5cp6bs4cyj9s61ap";
+    sha256 = "14akizp9aq8c2qk8bj5a6n3s8hsy356prp911cmrvl4l0rqcl5r0";
   };
 
   configureFlags =
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index c44a90a1663..6048a2fa81b 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -6,12 +6,12 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  version = "2.2.15";
+  version = "2.2.16";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "5f0e973839ed2e38a4d03adba109ef5ce3381bc2";
+    sha1 = "ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9";
   };
 
   #inherit sslSupport;

From 1089153c7ff391afaad9d38429718afb6e4093b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 22:43:00 +0000
Subject: [PATCH 07/21] * Add some more Xfce packages.

svn path=/nixpkgs/trunk/; revision=23047
---
 .../{terminal/default.nix => terminal.nix}    |  7 ++---
 .../core/{libexo/default.nix => exo.nix}      |  9 +++---
 pkgs/desktops/xfce-4/core/libxfce4util.nix    | 18 +++++++++++
 .../xfce-4/core/libxfce4util/default.nix      | 20 ------------
 pkgs/desktops/xfce-4/core/libxfcegui4.nix     | 22 +++++++++++++
 pkgs/desktops/xfce-4/core/xfconf.nix          | 20 ++++++++++++
 pkgs/desktops/xfce-4/core/xfwm4.nix           | 19 ++++++++++++
 pkgs/desktops/xfce-4/default.nix              | 31 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  5 ++-
 9 files changed, 110 insertions(+), 41 deletions(-)
 rename pkgs/desktops/xfce-4/applications/{terminal/default.nix => terminal.nix} (73%)
 rename pkgs/desktops/xfce-4/core/{libexo/default.nix => exo.nix} (63%)
 create mode 100644 pkgs/desktops/xfce-4/core/libxfce4util.nix
 delete mode 100644 pkgs/desktops/xfce-4/core/libxfce4util/default.nix
 create mode 100644 pkgs/desktops/xfce-4/core/libxfcegui4.nix
 create mode 100644 pkgs/desktops/xfce-4/core/xfconf.nix
 create mode 100644 pkgs/desktops/xfce-4/core/xfwm4.nix

diff --git a/pkgs/desktops/xfce-4/applications/terminal/default.nix b/pkgs/desktops/xfce-4/applications/terminal.nix
similarity index 73%
rename from pkgs/desktops/xfce-4/applications/terminal/default.nix
rename to pkgs/desktops/xfce-4/applications/terminal.nix
index 85f1aa21136..bd198a12af4 100644
--- a/pkgs/desktops/xfce-4/applications/terminal/default.nix
+++ b/pkgs/desktops/xfce-4/applications/terminal.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchurl
 , pkgconfig, ncurses
 , intltool, vte
-, libexo, libxfce4util
+, exo, libxfce4util
 , gtk
 }:
 
 stdenv.mkDerivation {
   name = "xfce-terminal-0.4.5";
+  
   src = fetchurl {
     url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.5.tar.bz2;
     sha256 = "14w8mhmyrq6dd9574zfvq0pymknljckq6qgcv1r6c1r22jydrzcj";
   };
 
-  buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ];
-
-  CPPFLAGS = "-I${libexo}/include/exo-0.3 -I{libxfce4util}/include/xfce4";
+  buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ];
 
   meta = {
     homepage = http://www.xfce.org/projects/terminal;
diff --git a/pkgs/desktops/xfce-4/core/libexo/default.nix b/pkgs/desktops/xfce-4/core/exo.nix
similarity index 63%
rename from pkgs/desktops/xfce-4/core/libexo/default.nix
rename to pkgs/desktops/xfce-4/core/exo.nix
index 837bf5b8ad0..ead11e8e127 100644
--- a/pkgs/desktops/xfce-4/core/libexo/default.nix
+++ b/pkgs/desktops/xfce-4/core/exo.nix
@@ -6,11 +6,12 @@
 , libxfce4util
 }:
 
-stdenv.mkDerivation {
-  name = "libexo-0.3.106";
+stdenv.mkDerivation rec {
+  name = "exo-0.3.107";
+  
   src = fetchurl {
-    url = http://archive.xfce.org/src/xfce/exo/0.3/exo-0.3.106.tar.bz2;
-    sha256 = "1n823ipqdz47kxq6fwry3zza3j9ap7gikwm4s8169297xcjqd6qb";
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha";
   };
 
   buildInputs = [ pkgconfig intltool URI glib gtk libxfce4util ];
diff --git a/pkgs/desktops/xfce-4/core/libxfce4util.nix b/pkgs/desktops/xfce-4/core/libxfce4util.nix
new file mode 100644
index 00000000000..e6565467e4c
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/libxfce4util.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "libxfce4util-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    sha256 = "10wcw7r8cjb0farffic037pcjr5bwrjrm8s3jrcb7c0b038pwbmf";
+  };
+
+  buildInputs = [ pkgconfig glib intltool ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Basic utility non-GUI functions for Xfce";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/libxfce4util/default.nix b/pkgs/desktops/xfce-4/core/libxfce4util/default.nix
deleted file mode 100644
index f47cb44c23d..00000000000
--- a/pkgs/desktops/xfce-4/core/libxfce4util/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl
-, pkgconfig
-, glib
-}:
-
-stdenv.mkDerivation {
-  name = "libxfce4util-4.6.1";
-  src = fetchurl {
-    url = http://www.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2;
-    sha256 = "0sy1222s0cq8zy2ankrp1747b6fg5jjahxrddih4gxc97iyxrv6f";
-  };
-
-  buildInputs = [ pkgconfig glib ];
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Basic utility non-GUI functions for Xfce";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/xfce-4/core/libxfcegui4.nix b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
new file mode 100644
index 00000000000..e5944510b40
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf, libglade }:
+
+stdenv.mkDerivation rec {
+  name = "libxfcegui4-4.6.4";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    sha1 = "a12c79f8fa14c5d1fc0fca5615a451b7d23f8695";
+  };
+
+  # By default, libxfcegui4 tries to install into libglade's prefix.
+  # Install into our own prefix instead.
+  configureFlags = "--with-libglade-module-path=$(out)/lib/libglade/2.0";
+
+  buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Basic GUI library for Xfce";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfconf.nix b/pkgs/desktops/xfce-4/core/xfconf.nix
new file mode 100644
index 00000000000..b4c14ef043e
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfconf.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "xfconf-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "2b9656a1b7f323d2600ddc929191afb50c8018f8";
+  };
+
+  buildInputs = [ pkgconfig intltool glib libxfce4util ];
+
+  propagatedBuildInputs = [ dbus_glib ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Simple client-server configuration storage and query system for Xfce";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfwm4.nix b/pkgs/desktops/xfce-4/core/xfwm4.nix
new file mode 100644
index 00000000000..20b33dcf4b4
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfwm4.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
+, libxfcegui4, xfconf, libwnck }:
+
+stdenv.mkDerivation rec {
+  name = "xfwm4-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11";
+  };
+
+  buildInputs = [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf libwnck ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Window manager for Xfce";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
index 76aa608677c..23be21de2e4 100644
--- a/pkgs/desktops/xfce-4/default.nix
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -1,28 +1,35 @@
-pkgs:
+{ callPackage, pkgs }:
+
 rec {
-  inherit (pkgs.gtkLibs) gtk;
+  inherit (pkgs.gtkLibs) gtk glib;
 
   #### CORE
 
-  libexo = import ./core/libexo {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gnome) intltool;
+  exo = callPackage ./core/exo.nix {
     inherit (pkgs.perlPackages) URI;
     inherit (pkgs.gtkLibs) glib gtk;
-    inherit libxfce4util;
   };
 
-  libxfce4util = import ./core/libxfce4util {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
+  libxfce4util = callPackage ./core/libxfce4util.nix {
     inherit (pkgs.gtkLibs) glib;
   };
 
+  libxfcegui4 = callPackage ./core/libxfcegui4.nix {
+    inherit (pkgs.gnome) libglade;
+  };
+
+  xfconf = callPackage ./core/xfconf.nix {
+  };
+
+  xfwm4 = callPackage ./core/xfwm4.nix {
+    inherit (pkgs.gnome) libglade libwnck;
+  };
+
   #### APPLICATIONS
-  terminal = import ./applications/terminal {
-    inherit (pkgs) stdenv fetchurl pkgconfig ncurses;
-    inherit (pkgs.gnome) intltool vte;
+  
+  terminal = callPackage ./applications/terminal.nix {
+    inherit (pkgs.gnome) vte;
     inherit (pkgs.gtkLibs) gtk;
-    inherit libexo libxfce4util;
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6aef60783d..cfe4e556722 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6568,7 +6568,10 @@ let
   };
 
   xfce = xfce4;
-  xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
+  
+  xfce4 = recurseIntoAttrs
+    (let callPackage = newScope pkgs.xfce4; in
+     import ../desktops/xfce-4 { inherit callPackage pkgs; });
 
   
   ### SCIENCE

From 9f77579f41d30eb7b1212f2bdd2c8a7d78fef2a6 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Mon, 9 Aug 2010 06:48:21 +0000
Subject: [PATCH 08/21] lua: install lua.pc

svn path=/nixpkgs/trunk/; revision=23049
---
 pkgs/development/interpreters/lua-5/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 5a35df4c513..b639a07ad9d 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -9,5 +9,10 @@ stdenv.mkDerivation {
   makeFlags = [ "CFLAGS=-fPIC" ];
   buildFlags = "linux"; # TODO: support for non-linux systems
   installFlags = "install INSTALL_TOP=\${out}";
+  postInstall = ''
+    sed -i -e "s@/usr/local@$out@" etc/lua.pc
+    sed -i -e "s@-llua -lm@-llua -lm -ldl@" etc/lua.pc
+    install -D -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc
+  '';
   buildInputs = [ ncurses readline ];
 }

From 3b6101cd7f3ed0a94586f710c8c834f4ef9ff7f6 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Mon, 9 Aug 2010 06:51:34 +0000
Subject: [PATCH 09/21] msn-pecan: an alternative MSN plugin for pidgin

svn path=/nixpkgs/trunk/; revision=23050
---
 .../pidgin-plugins/msn-pecan/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
new file mode 100644
index 00000000000..5e5cf311712
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pidgin} :
+
+stdenv.mkDerivation {
+  name = "pidgin-msn-pecan-0.1.0";
+  src = fetchurl {
+    url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2;
+    sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4";
+  };
+
+  meta = {
+    description = "Alternative MSN protocol plug-in for Pidgin IM.";
+    homepage = http://code.google.com/p/msn-pecan/;
+  };
+
+  makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out";
+  preInstall = "ensureDir \$out/share";
+  postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan";
+
+  buildInputs = [pidgin];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfe4e556722..2d1081a8a38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5896,6 +5896,8 @@ let
       inherit (gtkLibs) glib gtk;
     };
 
+  pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { };
+
   pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };
 
   pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { };

From 8b4da1a2642490716317ebbed8fd7251282d5d6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 11:42:55 +0000
Subject: [PATCH 10/21] * Add some more Xfce packages.

svn path=/nixpkgs/trunk/; revision=23054
---
 pkgs/desktops/xfce-4/core/libxfce4util.nix  |  2 +-
 pkgs/desktops/xfce-4/core/libxfcegui4.nix   |  7 +++++--
 pkgs/desktops/xfce-4/core/xfce-utils.nix    | 20 ++++++++++++++++++
 pkgs/desktops/xfce-4/core/xfce4-panel.nix   | 22 ++++++++++++++++++++
 pkgs/desktops/xfce-4/core/xfce4-session.nix | 22 ++++++++++++++++++++
 pkgs/desktops/xfce-4/core/xfdesktop.nix     | 21 +++++++++++++++++++
 pkgs/desktops/xfce-4/core/xfwm4.nix         |  2 +-
 pkgs/desktops/xfce-4/default.nix            | 23 ++++++++++++++-------
 8 files changed, 108 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/desktops/xfce-4/core/xfce-utils.nix
 create mode 100644 pkgs/desktops/xfce-4/core/xfce4-panel.nix
 create mode 100644 pkgs/desktops/xfce-4/core/xfce4-session.nix
 create mode 100644 pkgs/desktops/xfce-4/core/xfdesktop.nix

diff --git a/pkgs/desktops/xfce-4/core/libxfce4util.nix b/pkgs/desktops/xfce-4/core/libxfce4util.nix
index e6565467e4c..2625966bb58 100644
--- a/pkgs/desktops/xfce-4/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce-4/core/libxfce4util.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.xfce.org/;
     description = "Basic utility non-GUI functions for Xfce";
-    license = "GPLv2";
+    license = "bsd";
   };
 }
diff --git a/pkgs/desktops/xfce-4/core/libxfcegui4.nix b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
index e5944510b40..01913a3df59 100644
--- a/pkgs/desktops/xfce-4/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
@@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
 
   # By default, libxfcegui4 tries to install into libglade's prefix.
   # Install into our own prefix instead.
-  configureFlags = "--with-libglade-module-path=$(out)/lib/libglade/2.0";
+  preConfigure =
+    ''
+      configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
+    '';
 
   buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade ];
 
   meta = {
     homepage = http://www.xfce.org/;
     description = "Basic GUI library for Xfce";
-    license = "GPLv2";
+    license = "LGPLv2+";
   };
 }
diff --git a/pkgs/desktops/xfce-4/core/xfce-utils.nix b/pkgs/desktops/xfce-4/core/xfce-utils.nix
new file mode 100644
index 00000000000..4f520058ccf
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfce-utils.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 }:
+
+stdenv.mkDerivation rec {
+  name = "xfce-utils-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "6373886c3d70e576859741bde747a235567ffd8e";
+  };
+
+  configureFlags = "--with-xsession-prefix=$(out)/share/xsessions";
+
+  buildInputs = [ pkgconfig intltool gtk libxfce4util libxfcegui4 ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Utilities and scripts for Xfce";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfce4-panel.nix b/pkgs/desktops/xfce-4/core/xfce4-panel.nix
new file mode 100644
index 00000000000..db2e046dd6a
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfce4-panel.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, exo, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-panel-4.6.4";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 exo libwnck
+      libstartup_notification
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce panel";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfce4-session.nix b/pkgs/desktops/xfce-4/core/xfce4-session.nix
new file mode 100644
index 00000000000..dc563502542
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfce4-session.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, dbus_glib, xfconf, libglade, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-session-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck dbus_glib
+      xfconf libglade xorg.iceauth
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Session manager for Xfce";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfdesktop.nix b/pkgs/desktops/xfce-4/core/xfdesktop.nix
new file mode 100644
index 00000000000..c005e300e2f
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfdesktop.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, xfconf, libglade }:
+
+stdenv.mkDerivation rec {
+  name = "xfdesktop-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf
+      libglade ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce desktop manager";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfwm4.nix b/pkgs/desktops/xfce-4/core/xfwm4.nix
index 20b33dcf4b4..27a34043cad 100644
--- a/pkgs/desktops/xfce-4/core/xfwm4.nix
+++ b/pkgs/desktops/xfce-4/core/xfwm4.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.xfce.org/;
     description = "Window manager for Xfce";
-    license = "GPLv2";
+    license = "GPLv2+";
   };
 }
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
index 23be21de2e4..2aa25c19341 100644
--- a/pkgs/desktops/xfce-4/default.nix
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -7,29 +7,38 @@ rec {
 
   exo = callPackage ./core/exo.nix {
     inherit (pkgs.perlPackages) URI;
-    inherit (pkgs.gtkLibs) glib gtk;
   };
 
-  libxfce4util = callPackage ./core/libxfce4util.nix {
-    inherit (pkgs.gtkLibs) glib;
-  };
+  libxfce4util = callPackage ./core/libxfce4util.nix { };
 
   libxfcegui4 = callPackage ./core/libxfcegui4.nix {
     inherit (pkgs.gnome) libglade;
   };
 
-  xfconf = callPackage ./core/xfconf.nix {
-  };
+  xfconf = callPackage ./core/xfconf.nix { };
 
   xfwm4 = callPackage ./core/xfwm4.nix {
     inherit (pkgs.gnome) libglade libwnck;
   };
 
+  xfceutils = callPackage ./core/xfce-utils.nix { };
+
+  xfce4session = callPackage ./core/xfce4-session.nix {
+    inherit (pkgs.gnome) libglade libwnck;
+  };
+
+  xfce4panel = callPackage ./core/xfce4-panel.nix {
+    inherit (pkgs.gnome) libwnck;
+  };
+
+  xfdesktop = callPackage ./core/xfdesktop.nix {
+    inherit (pkgs.gnome) libwnck libglade;
+  };
+
   #### APPLICATIONS
   
   terminal = callPackage ./applications/terminal.nix {
     inherit (pkgs.gnome) vte;
-    inherit (pkgs.gtkLibs) gtk;
   };
 
 }

From be3d5d34960322c3267de8f074c769e5446daf3a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 Aug 2010 15:37:14 +0000
Subject: [PATCH 11/21] Update elfutils: the old ones are inaccessible, and too
 old to be found on other mirrors

svn path=/nixpkgs/trunk/; revision=23058
---
 pkgs/development/tools/misc/elfutils/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 655fff50a5b..ad3fd08e3ac 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -1,11 +1,14 @@
 {stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation rec {
-  name = "elfutils-0.143";
+  name = "elfutils-0.148";
   
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2";
-    sha256 = "1zrqs93m6frg7j70a96xdhdb4mnzmqgh91f9bbm39jnmgs50qp23";
+    urls = [
+      "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2"
+      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      ];
+    sha256 = "1nl7x2gidd2i048yjlvyzhpbca9793z435cw8bsircjxfi5gmswa";
   };
 
   buildInputs = [m4];

From e875ec25245337bb647ed76988d625986cb1ee71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 16:08:02 +0000
Subject: [PATCH 12/21] * Make sure that if pathsToLink contains an element
 such as   "/share/info" that it doesn't match "/share/information.nix".

svn path=/nixpkgs/trunk/; revision=23059
---
 pkgs/build-support/buildenv/builder.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index a181d72ab83..cdd65cbc523 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -17,7 +17,10 @@ sub isInPathsToLink {
     my $path = shift;
     $path = "/" if $path eq "";
     foreach my $elem (@pathsToLink) {
-        return 1 if substr($path, 0, length($elem)) eq $elem;
+        return 1 if
+            $elem eq "/" || 
+            (substr($path, 0, length($elem)) eq $elem
+             && (($path eq $elem) || (substr($path, length($elem), 1) eq "/")));
     }
     return 0;
 }

From 4ae72f5ab2e8a271d3c8549ac4f177e5523411d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 18:00:08 +0000
Subject: [PATCH 13/21] * Added pkgs/data/misc/hicolor-icon-theme, required by
 Xfce.

svn path=/nixpkgs/trunk/; revision=23060
---
 pkgs/data/misc/hicolor-icon-theme/default.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/data/misc/hicolor-icon-theme/default.nix

diff --git a/pkgs/data/misc/hicolor-icon-theme/default.nix b/pkgs/data/misc/hicolor-icon-theme/default.nix
new file mode 100644
index 00000000000..e249dac1dc9
--- /dev/null
+++ b/pkgs/data/misc/hicolor-icon-theme/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "hicolor-icon-theme-0.12";
+
+  src = fetchurl {
+    url = "http://icon-theme.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y";
+  };
+
+  meta = {
+    description = "Default fallback theme used by implementations of the icon theme specification";
+    homepage = http://icon-theme.freedesktop.org/releases/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d1081a8a38..6cbc65c0875 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4922,10 +4922,12 @@ let
 
   docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { };
 
-  junicode = callPackage ../data/fonts/junicode { };
-
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
+  hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
+  
+  junicode = callPackage ../data/fonts/junicode { };
+
   liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
 
   libertine = builderDefsPackage (import ../data/fonts/libertine/2.7.nix) {

From 238e80f7080e86485419456279da64873634d66e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 18:02:22 +0000
Subject: [PATCH 14/21] * More Xfce packages.

svn path=/nixpkgs/trunk/; revision=23061
---
 pkgs/desktops/xfce-4/core/exo.nix            | 13 ++++------
 pkgs/desktops/xfce-4/core/libxfce4menu.nix   | 18 ++++++++++++++
 pkgs/desktops/xfce-4/core/libxfcegui4.nix    |  8 +++++--
 pkgs/desktops/xfce-4/core/thunar.nix         | 25 ++++++++++++++++++++
 pkgs/desktops/xfce-4/core/xfce4-panel.nix    |  4 +++-
 pkgs/desktops/xfce-4/core/xfce4-settings.nix | 24 +++++++++++++++++++
 pkgs/desktops/xfce-4/core/xfdesktop.nix      |  5 ++--
 pkgs/desktops/xfce-4/core/xfwm4.nix          |  8 +++++--
 pkgs/desktops/xfce-4/default.nix             | 14 +++++++++++
 9 files changed, 104 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/desktops/xfce-4/core/libxfce4menu.nix
 create mode 100644 pkgs/desktops/xfce-4/core/thunar.nix
 create mode 100644 pkgs/desktops/xfce-4/core/xfce4-settings.nix

diff --git a/pkgs/desktops/xfce-4/core/exo.nix b/pkgs/desktops/xfce-4/core/exo.nix
index ead11e8e127..53fc8fa8fcd 100644
--- a/pkgs/desktops/xfce-4/core/exo.nix
+++ b/pkgs/desktops/xfce-4/core/exo.nix
@@ -1,10 +1,5 @@
-{ stdenv, fetchurl
-, pkgconfig
-, intltool
-, URI
-, glib, gtk
-, libxfce4util
-}:
+{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util
+, enableHAL ? true, hal, dbus_glib }:
 
 stdenv.mkDerivation rec {
   name = "exo-0.3.107";
@@ -14,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha";
   };
 
-  buildInputs = [ pkgconfig intltool URI glib gtk libxfce4util ];
+  buildInputs =
+    [ pkgconfig intltool URI glib gtk libxfce4util ] ++
+    stdenv.lib.optionals enableHAL [ hal dbus_glib ];
 
   meta = {
     homepage = http://www.xfce.org/projects/exo;
diff --git a/pkgs/desktops/xfce-4/core/libxfce4menu.nix b/pkgs/desktops/xfce-4/core/libxfce4menu.nix
new file mode 100644
index 00000000000..f8a0c1ba87c
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/libxfce4menu.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool, gtk, libxfce4util }:
+
+stdenv.mkDerivation rec {
+  name = "libxfce4menu-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    sha1 = "32a85c1ad31360347d5a2f240c4ddc08b444d124";
+  };
+
+  buildInputs = [ pkgconfig glib intltool gtk libxfce4util ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce menu support library";
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/libxfcegui4.nix b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
index 01913a3df59..52ee3a6262f 100644
--- a/pkgs/desktops/xfce-4/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce-4/core/libxfcegui4.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf, libglade }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
+, libglade, libstartup_notification }:
 
 stdenv.mkDerivation rec {
   name = "libxfcegui4-4.6.4";
@@ -15,7 +16,10 @@ stdenv.mkDerivation rec {
       configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
     '';
 
-  buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade ];
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util xfconf libglade
+      libstartup_notification
+    ];
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce-4/core/thunar.nix b/pkgs/desktops/xfce-4/core/thunar.nix
new file mode 100644
index 00000000000..adbbd461c5e
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/thunar.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util
+, dbus_glib, libstartup_notification, xfconf, hal, xfce4panel
+, gamin }:
+
+stdenv.mkDerivation rec {
+  name = "thunar-1.0.2";
+  
+  src = fetchurl {
+    url = http://www.xfce.org/archive/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2;
+    sha1 = "f7ae00c32402e4bc502aba15477b78e2c558c7c3";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool exo gtk libxfce4util
+      dbus_glib libstartup_notification xfconf xfce4panel gamin
+    ];
+
+  propagatedBuildInputs = [ hal ];
+
+  meta = {
+    homepage = http://thunar.xfce.org/;
+    description = "Xfce file manager";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfce4-panel.nix b/pkgs/desktops/xfce-4/core/xfce4-panel.nix
index db2e046dd6a..b8a8c145801 100644
--- a/pkgs/desktops/xfce-4/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce-4/core/xfce4-panel.nix
@@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig intltool gtk libxfce4util libxfcegui4 exo libwnck
+    [ pkgconfig intltool gtk libxfce4util exo libwnck
       libstartup_notification
     ];
 
+  propagatedBuildInputs = [ libxfcegui4 ];
+
   meta = {
     homepage = http://www.xfce.org/;
     description = "Xfce panel";
diff --git a/pkgs/desktops/xfce-4/core/xfce4-settings.nix b/pkgs/desktops/xfce-4/core/xfce4-settings.nix
new file mode 100644
index 00000000000..b0bfadf8e52
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/xfce4-settings.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfcegui4
+, libglade, xfconf, xorg, libwnck, libnotify }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-settings-4.6.5";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "c036cc2f3100a46b2649e678dff7c0106b219263";
+  };
+
+  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
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Settings manager for Xfce";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/xfdesktop.nix b/pkgs/desktops/xfce-4/core/xfdesktop.nix
index c005e300e2f..83de4ed4dfe 100644
--- a/pkgs/desktops/xfce-4/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce-4/core/xfdesktop.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
-, libwnck, xfconf, libglade }:
+, libwnck, xfconf, libglade, libxfce4menu, xfce4panel, thunar, exo }:
 
 stdenv.mkDerivation rec {
   name = "xfdesktop-4.6.2";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf
-      libglade ];
+      libglade libxfce4menu xfce4panel thunar exo
+    ];
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce-4/core/xfwm4.nix b/pkgs/desktops/xfce-4/core/xfwm4.nix
index 27a34043cad..c7bab240691 100644
--- a/pkgs/desktops/xfce-4/core/xfwm4.nix
+++ b/pkgs/desktops/xfce-4/core/xfwm4.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
-, libxfcegui4, xfconf, libwnck }:
+, libxfcegui4, xfconf, libwnck, libstartup_notification, xorg }:
 
 stdenv.mkDerivation rec {
   name = "xfwm4-4.6.2";
@@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11";
   };
 
-  buildInputs = [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf libwnck ];
+  buildInputs =
+    [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf
+      libwnck libstartup_notification
+      xorg.libXcomposite xorg.libXfixes xorg.libXdamage
+    ];
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
index 2aa25c19341..a6d2629c3b5 100644
--- a/pkgs/desktops/xfce-4/default.nix
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -15,6 +15,8 @@ rec {
     inherit (pkgs.gnome) libglade;
   };
 
+  libxfce4menu = callPackage ./core/libxfce4menu.nix { };
+
   xfconf = callPackage ./core/xfconf.nix { };
 
   xfwm4 = callPackage ./core/xfwm4.nix {
@@ -27,6 +29,10 @@ rec {
     inherit (pkgs.gnome) libglade libwnck;
   };
 
+  xfce4settings = callPackage ./core/xfce4-settings.nix {
+    inherit (pkgs.gnome) libglade libwnck;
+  };
+
   xfce4panel = callPackage ./core/xfce4-panel.nix {
     inherit (pkgs.gnome) libwnck;
   };
@@ -35,10 +41,18 @@ rec {
     inherit (pkgs.gnome) libwnck libglade;
   };
 
+  thunar = callPackage ./core/thunar.nix {
+    #inherit (pkgs.gnome) libwnck libglade;
+  };
+
   #### APPLICATIONS
   
   terminal = callPackage ./applications/terminal.nix {
     inherit (pkgs.gnome) vte;
   };
 
+  #### ART
+
+  xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
+  
 }

From f0ae36e31cf67e9fdcf1427d0ef7a1c84f5bf182 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 18:06:27 +0000
Subject: [PATCH 15/21] * Doh.

svn path=/nixpkgs/trunk/; revision=23063
---
 pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix

diff --git a/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix
new file mode 100644
index 00000000000..a1d628538ba
--- /dev/null
+++ b/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-icon-theme-4.4.3";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2";
+    sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7";
+  };
+
+  buildInputs = [ pkgconfig intltool ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Icons for Xfce";
+  };
+}

From 79fcd0a04ceb5031cdf2070c3e23ddbad17a86aa Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Aug 2010 18:45:44 +0000
Subject: [PATCH 16/21] updated net::twitter, scope::upper, added
 uri::googlechart

svn path=/nixpkgs/trunk/; revision=23065
---
 pkgs/top-level/perl-packages.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cdc3ef31169..38fcb828cd5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1923,11 +1923,11 @@ rec {
   };
 
   NetTwitterLite = buildPerlPackage {
-    name = "Net-Twitter-Lite-0.08003";
+    name = "Net-Twitter-Lite-0.10003";
 
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.08003.tar.gz;
-      sha256 = "11p8w650cpfplwcrnk3qrz3l5235i37dwgrji8xpgccix4vsrfpl";
+      url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.10003.tar.gz;
+      sha256 = "1qh5bw68ad4fqiqbqwhgj859kq35asjmp0fsmrqhlbqy195pwi1i";
     };
 
     propagatedBuildInputs = [JSONAny Encode LWP];
@@ -2206,10 +2206,10 @@ rec {
   };
 
   ScopeUpper = buildPerlPackage rec {
-    name = "Scope-Upper-0.10";
+    name = "Scope-Upper-0.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
-      sha256 = "0llscmwyw657pzid2lpc3q8zz3jj28aa66bdpmldv6gfa2a5ny1v";
+      sha256 = "1yrjx22hlsv2qdgicnz589j9iipyxl56y6pnks2cfg6icpp97v5w";
     };
   };
 
@@ -2760,6 +2760,15 @@ rec {
     };
   };
 
+  UriGoogleChart = buildPerlPackage rec {
+    name = "URI-GoogleChart-1.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
+      sha256 = "00hq5cpsk7sa04n0wg52qhpqf9i2849yyvw2zk83ayh1qqpc50js";
+    };
+    buildInputs = [URI TestMore];
+  };
+
   VariableMagic = buildPerlPackage rec {
     name = "Variable-Magic-0.36";
     src = fetchurl {

From 2670c1c67be5e43385ab3cd08f0a25e6c03a890e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Aug 2010 19:29:06 +0000
Subject: [PATCH 17/21] update some perl packages

svn path=/nixpkgs/trunk/; revision=23066
---
 pkgs/top-level/perl-packages.nix | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 38fcb828cd5..8c2b616d796 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -714,6 +714,14 @@ rec {
     };
   };
 
+  CommonSense = buildPerlPackage {
+    name = "common-sense-3.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.3.tar.gz;
+      sha256 = "04j0lf5lwc70x33dfxxhqhylgikyb6p43mpc3daydx601wblscbj";
+    };
+  };
+
   CookieXS = buildPerlPackage rec {
     name = "Cookie-XS-0.11";
     src = fetchurl {
@@ -1093,10 +1101,10 @@ rec {
   };
 
   Encode = buildPerlPackage {
-    name = "Encode-2.25";
+    name = "Encode-2.39";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.25.tar.gz;
-      sha256 = "0prwmbg3xh1lqskianwrfrgasdfmz4kjm3qpdm27ay110jkk25ak";
+      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.39.tar.gz;
+      sha256 = "0d9gzgxl9z5x2zq34m6gbx672b599h0fay4q0pfgv3va8mrm1wdz";
     };
   };
 
@@ -1580,10 +1588,10 @@ rec {
   };
 
   JSON = buildPerlPackage rec {
-    name = "JSON-2.15";
+    name = "JSON-2.21";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
-      sha256 = "0dijqv5b6gnkmdnysx23229kvfg6mwvrxyjrvzn2j9r4m2hmsgvn";
+      sha256 = "1dz00922yq7pz8hb9bbk8pqkwh0brf595lklsind62lf5f247vj7";
     };
     propagatedBuildInputs = [JSONXS];
   };
@@ -1598,11 +1606,12 @@ rec {
   };
 
   JSONXS = buildPerlPackage rec {
-    name = "JSON-XS-2.24";
+    name = "JSON-XS-2.29";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
-      sha256 = "0ir0v87w2fwalcwi2fd49mqzjna7cixn3ri0ai6ysdwnsdvbhyny";
+      sha256 = "1gl8x2rc3krpj6cs1dg0g28iqqfbn9zyq4nz9mbngv0lccc0y5vy";
     };
+    buildInputs = [CommonSense];
   };
 
   libxml_perl = buildPerlPackage rec {
@@ -1929,8 +1938,9 @@ rec {
       url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.10003.tar.gz;
       sha256 = "1qh5bw68ad4fqiqbqwhgj859kq35asjmp0fsmrqhlbqy195pwi1i";
     };
+    doCheck = false;
 
-    propagatedBuildInputs = [JSONAny Encode LWP];
+    propagatedBuildInputs = [JSONAny Encode LWP CryptSSLeay];
   };
 
   ObjectSignature = buildPerlPackage {

From 093980344de5ee3f418c905f4e40bf85473bff72 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 19:41:12 +0000
Subject: [PATCH 18/21] * More Xfce stuff.

svn path=/nixpkgs/trunk/; revision=23067
---
 .../desktops/xfce-4/applications/mousepad.nix | 18 ++++++++++++++
 .../xfce-4/applications/ristretto.nix         | 24 +++++++++++++++++++
 pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix | 19 +++++++++++++++
 pkgs/desktops/xfce-4/default.nix              | 10 +++++---
 4 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/xfce-4/applications/mousepad.nix
 create mode 100644 pkgs/desktops/xfce-4/applications/ristretto.nix
 create mode 100644 pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix

diff --git a/pkgs/desktops/xfce-4/applications/mousepad.nix b/pkgs/desktops/xfce-4/applications/mousepad.nix
new file mode 100644
index 00000000000..920151282a8
--- /dev/null
+++ b/pkgs/desktops/xfce-4/applications/mousepad.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "mousepad-0.2.16";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/src/apps/mousepad/0.2/${name}.tar.bz2";
+    sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9";
+  };
+
+  buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 gtk ];
+
+  meta = {
+    homepage = http://www.xfce.org/projects/mousepad/;
+    description = "A simple text editor for Xfce";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/applications/ristretto.nix b/pkgs/desktops/xfce-4/applications/ristretto.nix
new file mode 100644
index 00000000000..198421e21d3
--- /dev/null
+++ b/pkgs/desktops/xfce-4/applications/ristretto.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar
+, exo, dbus_glib, libxfce4util, libxfcegui4, xfconf }:
+
+stdenv.mkDerivation rec {
+  name = "ristretto-0.0.22";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/src/apps/ristretto/0.0/${name}.tar.gz";
+    sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool libexif gtk thunar exo dbus_glib
+      libxfce4util libxfcegui4 xfconf
+    ];
+
+  NIX_LDFLAGS = "-lX11";
+
+  meta = {
+    homepage = http://goodies.xfce.org/projects/applications/ristretto;
+    description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix
new file mode 100644
index 00000000000..bab382a263f
--- /dev/null
+++ b/pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "gtk-xfce-engine-2.6.0";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "a7be2f330833d150c5fb37f68a4c2138348b5446";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "GTK+ theme engine for Xfce";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
index a6d2629c3b5..81c06316fd9 100644
--- a/pkgs/desktops/xfce-4/default.nix
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -41,9 +41,9 @@ rec {
     inherit (pkgs.gnome) libwnck libglade;
   };
 
-  thunar = callPackage ./core/thunar.nix {
-    #inherit (pkgs.gnome) libwnck libglade;
-  };
+  thunar = callPackage ./core/thunar.nix { };
+
+  gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
 
   #### APPLICATIONS
   
@@ -51,6 +51,10 @@ rec {
     inherit (pkgs.gnome) vte;
   };
 
+  mousepad = callPackage ./applications/mousepad.nix { };
+
+  ristretto = callPackage ./applications/ristretto.nix { };
+
   #### ART
 
   xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };

From 1b59ae0b838666fe1f59ba1f291f5147f3ee64b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Aug 2010 20:59:38 +0000
Subject: [PATCH 19/21] Adding 'mupdf', a lightweight PDF 1.7 viewer As a side
 effect, I add openjpeg and jbig2dec.

svn path=/nixpkgs/trunk/; revision=23069
---
 pkgs/applications/misc/mupdf/default.nix      | 24 +++++++++++++++++++
 .../libraries/jbig2dec/default.nix            | 16 +++++++++++++
 .../libraries/openjpeg/default.nix            | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 ++++++
 4 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/misc/mupdf/default.nix
 create mode 100644 pkgs/development/libraries/jbig2dec/default.nix
 create mode 100644 pkgs/development/libraries/openjpeg/default.nix

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
new file mode 100644
index 00000000000..15d2ac98804
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
+, libX11, libXext }:
+stdenv.mkDerivation rec {
+  name = "mupdf-0.6";
+
+  src = fetchurl {
+    url = "http://mupdf.com/download/source/${name}.tar.gz";
+    sha256 = "01cn2kz4zx53qhqvbxy8xd7xqbh58kpid8ykvx5hz7pf2gqw91vg";
+  };
+
+  buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
+
+  preBuild = ''
+    export makeFlags="prefix=$out"
+  '';
+
+  meta = {
+    homepage = http://mupdf.com/;
+    description = "Lightweight PDF viewer and toolkit written in portable C";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
new file mode 100644
index 00000000000..60c6e9922a4
--- /dev/null
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }: 
+
+stdenv.mkDerivation {
+  name = "jbig2dec-0.11";
+  
+  src = fetchurl {
+    url = http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz;
+    sha256 = "1ffhgmf2fqzk0h4k736pp06z7q5y4x41fg844bd6a9vgncq86bby";
+  };
+  
+  meta = {
+    homepage = http://jbig2dec.sourceforge.net/;
+    description = "Decoder implementation of the JBIG2 image compression format";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
new file mode 100644
index 00000000000..e54f29003f4
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }: 
+
+stdenv.mkDerivation {
+  name = "openjpeg-1.2";
+  
+  src = fetchurl {
+    url = http://www.openjpeg.org/openjpeg_v1_2.tar.gz;
+    sha256 = "1i72i0hhssgg6vfkaw3gpwf5ld65g9s77ay8pxd4any1xy54qa90";
+  };
+
+  patchPhase = ''
+    sed -i -e 's/-o root -g [^ ]\+//' Makefile Makefile.osx
+  '';
+
+  preInstall = ''
+    export installFlags="PREFIX=$out"
+  '';
+  
+  meta = {
+    homepage = http://www.openjpeg.org/;
+    description = "Open-source JPEG 2000 codec written in C language";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cbc65c0875..db0a0416777 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3079,6 +3079,8 @@ let
 
   jasper = callPackage ../development/libraries/jasper { };
 
+  jbig2dec = callPackage ../development/libraries/jbig2dec { };
+
   jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { };
 
   jetty_util = callPackage ../development/libraries/java/jetty-util { };
@@ -3533,6 +3535,8 @@ let
     opensc = opensc_0_11_7;
   };
 
+  openjpeg = callPackage ../development/libraries/openjpeg { };
+
   openssl = callPackage ../development/libraries/openssl {
     fetchurl = fetchurlBoot;
   };
@@ -5813,6 +5817,9 @@ let
 
   msmtp = callPackage ../applications/networking/msmtp { };
 
+  mupdf = callPackage ../applications/misc/mupdf {
+  };
+
   mythtv = callPackage ../applications/video/mythtv {
     qt3 = qt3mysql;
   };

From ac387916b82741ed2e056a41c8bcf2d4b4f73e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Aug 2010 21:13:36 +0000
Subject: [PATCH 20/21] Adding the calendar program 'pal'

svn path=/nixpkgs/trunk/; revision=23070
---
 pkgs/tools/misc/pal/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 ++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/misc/pal/default.nix

diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix
new file mode 100644
index 00000000000..fbc6d607650
--- /dev/null
+++ b/pkgs/tools/misc/pal/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "pal-0.4.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/palcal/${name}.tgz";
+    sha256 = "1601nsspxscm7bp9g9bkia0ij0mx2lpskl2fqhs5r0smp92121nx";
+  };
+
+  patchPhase = ''
+    sed -i -e 's/-o root//' -e 's,ESTDIR}/etc,ESTDIR}'$out/etc, src/Makefile
+    sed -i -e 's,/etc/pal\.conf,'$out/etc/pal.conf, src/input.c
+  '';
+
+  preBuild = ''
+    export makeFlags="prefix=$out"
+  '';
+
+  buildInputs = [ glib gettext readline pkgconfig ];
+
+  meta = {
+    homepage = http://palcal.sourceforge.net/;
+    description = "Command-line calendar program that can keep track of events";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db0a0416777..b038db428be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -945,6 +945,10 @@ let
 
   p7zip = callPackage ../tools/archivers/p7zip { };
 
+  pal = callPackage ../tools/misc/pal {
+    inherit (gtkLibs) glib;
+  };
+
   panomatic = callPackage ../tools/graphics/panomatic { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline { };

From 153577d0f3511dd7e81641f64c3424b07a73d17b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 21:14:08 +0000
Subject: [PATCH 21/21] * Add GTK+ as a dependency to generate the icon cache.

svn path=/nixpkgs/trunk/; revision=23071
---
 pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix
index a1d628538ba..a17267a336c 100644
--- a/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix
+++ b/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
 
 stdenv.mkDerivation rec {
   name = "xfce4-icon-theme-4.4.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7";
   };
 
-  buildInputs = [ pkgconfig intltool ];
+  buildInputs = [ pkgconfig intltool gtk ];
 
   meta = {
     homepage = http://www.xfce.org/;