Author: eelco
Date: Thu Jul 7 20:02:59 2011
New Revision: 27641
URL: https://svn.nixos.org/websvn/nix/?rev=27641&sc=1
Log:
* doxygen: only build the Qt GUI in doxygen_gui.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/tools/documentation/doxygen/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/tools/documentation/doxygen/default.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/development/tools/documentation/doxygen/default.nix
Thu Jul 7 19:56:01 2011 (r27640)
+++
nixpkgs/branches/kde-4.7/pkgs/development/tools/documentation/doxygen/default.nix
Thu Jul 7 20:02:59 2011 (r27641)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, graphviz, perl, flex, bison, gnumake, libX11, libXext, qt}:
+{ stdenv, fetchurl, perl, flex, bison, qt }:
stdenv.mkDerivation rec {
name = "doxygen-1.7.4";
@@ -10,24 +10,26 @@
patches = [ ./tmake.patch ];
- buildInputs = [ graphviz perl flex bison libX11 libXext ]
- ++ (if (qt != null) then [ qt ] else []);
+ buildInputs =
+ [ perl flex bison ]
+ ++ stdenv.lib.optional (qt != null) qt;
prefixKey = "--prefix ";
- configureFlags = "--release"
- + (if qt == null then "" else " --with-doxywizard")
- ;
- makeFlags = "MAN1DIR=share/man/man1";
- preConfigure =
- (if (qt == null)
- then ""
- else ''
+
+ configureFlags =
+ [ "--dot dot" ]
+ ++ stdenv.lib.optional (qt != null) "--with-doxywizard";
+
+ preConfigure = stdenv.lib.optionalString (qt != null)
+ ''
echo "using 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 = {
license = "GPLv2+";
homepage = "http://doxygen.org/";;
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 7
19:56:01 2011 (r27640)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 7
20:02:59 2011 (r27641)
@@ -2654,7 +2654,11 @@
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;
};
@@ -2984,7 +2988,7 @@
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 {
inherit (gnome) glib pango gtk;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
