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

cmake: use single output

Browse Source 
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.
This commit is contained in:
Thomas Tuegel 2016-05-04 08:23:39 -05:00
parent 68b4c4caa7
commit b70d728ed7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
optional (stdenv ? glibc) ./search-path-3.2.patch optional (stdenv ? glibc) ./search-path-3.2.patch
++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" "doc" ]; outputs = [ "out" ];
setOutputFlags = false; setOutputFlags = false;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
--subst-var-by glibc_lib ${getLib glibc} --subst-var-by glibc_lib ${getLib glibc}
''; '';
configureFlags = configureFlags =
[ "--docdir=/share/doc/${name}" [ "--docdir=share/doc/${name}"
"--no-system-jsoncpp" "--no-system-jsoncpp"
] ]
++ optional (!stdenv.isCygwin) "--system-libs" ++ optional (!stdenv.isCygwin) "--system-libs"
@ -64,10 +64,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
preInstall = ''mkdir "$doc" '';
postInstall = ''moveToOutput "share/cmake-*/Help" "$doc" '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.cmake.org/; homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator"; description = "Cross-Platform Makefile Generator";