6 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/TODO b/pkgs/TODO
index c63a40d85bc6..abbd58ddb5ae 100644
--- a/pkgs/TODO
+++ b/pkgs/TODO
@@ -10,3 +10,7 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* diffutils retains a dependency on coreutils/bin/pr; causes stdenv to
+  depend on 2 copies of coreutils (the first one impure in
+  stdenv-nix-linux!)
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
new file mode 100644
index 000000000000..5681acba13aa
--- /dev/null
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, wxGTK, chmlib}:
+
+stdenv.mkDerivation {
+  name = "xchm-0.9.1";
+  src = fetchurl {
+    url = http://belnet.dl.sourceforge.net/sourceforge/xchm/xchm-0.9.1.tar.gz;
+    md5 = "5ba671e09e4c3ac46ffb5ce9d2c985eb";
+  };
+  buildInputs = [wxGTK chmlib];
+}
diff --git a/pkgs/development/libraries/chmlib/builder.sh b/pkgs/development/libraries/chmlib/builder.sh
new file mode 100644
index 000000000000..7ecc1ca3be59
--- /dev/null
+++ b/pkgs/development/libraries/chmlib/builder.sh
@@ -0,0 +1,16 @@
+. $stdenv/setup
+
+unpackCmd="tar xvfj $src"
+
+makeFlags="CC=gcc LD=gcc INSTALLPREFIX=$out"
+
+preInstall() {
+    mkdir $out
+    mkdir $out/lib
+    mkdir $out/include
+}
+preInstall=preInstall
+
+installFlags=$makeFlags
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
new file mode 100644
index 000000000000..2b6814745eb7
--- /dev/null
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, libtool}:
+
+stdenv.mkDerivation {
+  name = "chmlib-0.31";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.31.tbz;
+    md5 = "c6c9e1658f43715456e00a4893d496ed";
+  };
+  buildInputs = [libtool];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 43fc629b7124..b93a56252cf9 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -459,6 +459,10 @@ rec {
     inherit fetchurl stdenv pkgconfig freetype expat;
   };
 
+  chmlib = (import ../development/libraries/chmlib) {
+    inherit fetchurl stdenv libtool;
+  };
+
   perlBerkeleyDB = (import ../development/perl-modules/BerkeleyDB) {
     inherit fetchurl stdenv perl db4;
   };
@@ -591,6 +595,10 @@ rec {
     inherit fetchurl stdenv perl;
   };
 
+  xchm = (import ../applications/misc/xchm) {
+    inherit fetchurl stdenv wxGTK chmlib;
+  };
+
   nxml = (import ../applications/editors/emacs/modes/nxml) {
     inherit fetchurl stdenv;
   };
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index c1c6fe3ff68f..e311fc2898dd 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -48,6 +48,7 @@ let {
       pkgs.zapping
       pkgs.gqview
       pkgs.hello
+      pkgs.xchm
       pkgs.nxml
       pkgs.uml
       pkgs.nix