diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 11:27:47 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 11:27:47 +0000 |
| commit | 166e87319c042c5f1a9d2cbd4ea132162762c262 (patch) | |
| tree | 5c437a036abbdf2ee9489c0ba045ad494a20a97a /pkgs/development/tools/build-managers | |
| parent | 417124626b92bc1a7f6802136a55016bb8959739 (diff) | |
| download | nixlib-166e87319c042c5f1a9d2cbd4ea132162762c262.tar nixlib-166e87319c042c5f1a9d2cbd4ea132162762c262.tar.gz nixlib-166e87319c042c5f1a9d2cbd4ea132162762c262.tar.bz2 nixlib-166e87319c042c5f1a9d2cbd4ea132162762c262.tar.lz nixlib-166e87319c042c5f1a9d2cbd4ea132162762c262.tar.xz nixlib-166e87319c042c5f1a9d2cbd4ea132162762c262.tar.zst nixlib-166e87319c042c5f1a9d2cbd4ea132162762c262.zip | |
Fix cmake-2.6.4 build (add xmlrpc-c)
svn path=/nixpkgs/trunk/; revision=32505
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/264.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix index 02c728791139..8924e8dd7933 100644 --- a/pkgs/development/tools/build-managers/cmake/264.nix +++ b/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; |