public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cmake-2.6.4 build (add xmlrpc-c)

Browse Source 
svn path=/nixpkgs/trunk/; revision=32505
This commit is contained in:
Yury G. Kudryashov
2012-02-23 11:27:47 +00:00
parent 417124626b
commit 166e87319c
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/build-managers/cmake/264.nix
View File

@@ -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;