diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 11:22:22 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 11:56:11 +0200 |
commit | e03d1ababa86b2564043f0afd479c64ec55d5f83 (patch) | |
tree | 828055b4e7eafb320511c0e3569d8e6f2cdaad3d /pkgs/development/tools/build-managers | |
parent | 1dd3ece50e50ed92b6df892105d44c437ca26ebc (diff) | |
download | nixlib-e03d1ababa86b2564043f0afd479c64ec55d5f83.tar nixlib-e03d1ababa86b2564043f0afd479c64ec55d5f83.tar.gz nixlib-e03d1ababa86b2564043f0afd479c64ec55d5f83.tar.bz2 nixlib-e03d1ababa86b2564043f0afd479c64ec55d5f83.tar.lz nixlib-e03d1ababa86b2564043f0afd479c64ec55d5f83.tar.xz nixlib-e03d1ababa86b2564043f0afd479c64ec55d5f83.tar.zst nixlib-e03d1ababa86b2564043f0afd479c64ec55d5f83.zip |
cmake-2.8: Fix build
The use of multiple outputs in libarchive broke it. Since this is an ancient version of cmake, let's fix it by just using --no-system-libarchive.
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/2.8.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 919c80e7ce58..d824c3e2c964 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. + # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path.patch ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; }); - buildInputs = [ curl expat zlib bzip2 libarchive ] + buildInputs = [ curl expat zlib bzip2 ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); configureFlags = - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs --no-system-libarchive" + stdenv.lib.optionalString useQt4 " --qt-gui"; setupHook = ./setup-hook.sh; |