From b70d728ed78021b63f11b167c169188d7c8dea73 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 4 May 2016 08:23:39 -0500 Subject: [PATCH] cmake: use single output Fixes #15184. Install everything, including documentation, into one output, increasing package size by 10%. Otherwise, the help commands for CMake do not work. This is a good trade because CMake should be a build-only dependency. The only reason the docs should ever make it to runtime is if the user has actually installed CMake, in which case there's a pretty good chance they want the docs, too. --- pkgs/development/tools/build-managers/cmake/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index e1528aa5f00..32e16751395 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { optional (stdenv ? glibc) ./search-path-3.2.patch ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; - outputs = [ "out" "doc" ]; + outputs = [ "out" ]; setOutputFlags = false; setupHook = ./setup-hook.sh; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { --subst-var-by glibc_lib ${getLib glibc} ''; configureFlags = - [ "--docdir=/share/doc/${name}" + [ "--docdir=share/doc/${name}" "--no-system-jsoncpp" ] ++ optional (!stdenv.isCygwin) "--system-libs" @@ -64,10 +64,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preInstall = ''mkdir "$doc" ''; - - postInstall = ''moveToOutput "share/cmake-*/Help" "$doc" ''; - meta = with stdenv.lib; { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator";