Fix cmake-2.6.4 build (add xmlrpc-c)

svn path=/nixpkgs/trunk/; revision=32505

pkgs/development/libraries/xmlrpc-c/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchsvn, curl }:
+
+let rev = "2262"; in
+stdenv.mkDerivation {
+  name = "xmlrpc-c-r${rev}";
+
+  buildInputs = [ curl ];
+
+  preInstall = "export datarootdir=$out/share";
+
+  src = fetchsvn {
+    url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced;
+    rev = "2262";
+    sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb";
+  };
+}

pkgs/development/tools/build-managers/cmake/264.nix

@@ -1,5 +1,5 @@
 { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4
+, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
 , darwinInstallNameToolUtility }:
 
 with stdenv.lib;
@@ -11,7 +11,6 @@ let
   version = "${majorVersion}.${minorVersion}";
 in
 
-# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux
 stdenv.mkDerivation rec {
   name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
 
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
     # Nixpkgs' Glibc.
     optional (stdenv ? glibc) ./search-path-264.patch;
 
-  buildInputs = [ curl expat zlib bzip2 libarchive ]
+  buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
     ++ optional stdenv.isDarwin darwinInstallNameToolUtility
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;

pkgs/top-level/all-packages.nix

@@ -4821,6 +4821,8 @@ let
     ];
   };
 
+  xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
+
   xvidcore = callPackage ../development/libraries/xvidcore { };
 
   yajl = callPackage ../development/libraries/yajl { };