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

* doxygen: only build the Qt GUI in doxygen_gui.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=27641
This commit is contained in:
Eelco Dolstra 2011-07-07 20:02:59 +00:00
parent 3049b6788b
commit 32abd0987d
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/tools/documentation/doxygen/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, graphviz, perl, flex, bison, gnumake, libX11, libXext, qt}: { stdenv, fetchurl, perl, flex, bison, qt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "doxygen-1.7.4"; name = "doxygen-1.7.4";
@ -10,24 +10,26 @@ stdenv.mkDerivation rec {
patches = [ ./tmake.patch ]; patches = [ ./tmake.patch ];
buildInputs = [ graphviz perl flex bison libX11 libXext ] buildInputs =
++ (if (qt != null) then [ qt ] else []); [ perl flex bison ]
++ stdenv.lib.optional (qt != null) qt;
prefixKey = "--prefix "; prefixKey = "--prefix ";
configureFlags = "--release"
+ (if qt == null then "" else " --with-doxywizard") configureFlags =
; [ "--dot dot" ]
makeFlags = "MAN1DIR=share/man/man1"; ++ stdenv.lib.optional (qt != null) "--with-doxywizard";
preConfigure =
(if (qt == null) preConfigure = stdenv.lib.optionalString (qt != null)
then "" ''
else ''
echo "using QTDIR=${qt}..." echo "using QTDIR=${qt}..."
export QTDIR=${qt} export QTDIR=${qt}
''); '';
# export CPLUS_INCLUDE_PATH="${qt}/include:$CPLUS_INCLUDE_PATH"
# export LIBRARY_PATH="${qt}/lib:$LIBRARY_PATH"
makeFlags = "MAN1DIR=share/man/man1";
enableParallelBuilding = true;
meta = { meta = {
license = "GPLv2+"; license = "GPLv2+";
homepage = "http://doxygen.org/"; homepage = "http://doxygen.org/";

8
pkgs/top-level/all-packages.nix
View File

@ -2654,7 +2654,11 @@ let
inherit python pil makeWrapper; inherit python pil makeWrapper;
}; };
doxygen = callPackage ../development/tools/documentation/doxygen { doxygen = lowPrio (callPackage ../development/tools/documentation/doxygen {
qt = null;
});
doxygen_gui = doxygen.override {
qt = qt4; qt = qt4;
}; };
@ -2984,7 +2988,7 @@ let
clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) {
}; };
cluceneCore = callPackage ../development/libraries/clucene-core { }; clucene_core = callPackage ../development/libraries/clucene-core { };
clutter = callPackage ../development/libraries/clutter { clutter = callPackage ../development/libraries/clutter {
inherit (gnome) glib pango gtk; inherit (gnome) glib pango gtk;