diff options
| author | Raymond Gauthier <jraygauthier@gmail.com> | 2016-03-11 16:15:40 -0500 |
|---|---|---|
| committer | Raymond Gauthier <jraygauthier@gmail.com> | 2016-03-14 10:20:48 -0400 |
| commit | aef5836e3cbc98137eab9149c3b986b2553a652a (patch) | |
| tree | 4bcd8da588aa431310f60db3a475382b984299de /pkgs/development/tools/documentation | |
| parent | 329addf0b3e4c58f258031757ec110f0e1fdce23 (diff) | |
| download | nixpkgs-aef5836e3cbc98137eab9149c3b986b2553a652a.tar nixpkgs-aef5836e3cbc98137eab9149c3b986b2553a652a.tar.gz nixpkgs-aef5836e3cbc98137eab9149c3b986b2553a652a.tar.bz2 nixpkgs-aef5836e3cbc98137eab9149c3b986b2553a652a.tar.lz nixpkgs-aef5836e3cbc98137eab9149c3b986b2553a652a.tar.xz nixpkgs-aef5836e3cbc98137eab9149c3b986b2553a652a.tar.zst nixpkgs-aef5836e3cbc98137eab9149c3b986b2553a652a.zip | |
doxygen: 1.8.6 -> 1.8.11
As per upstream change, now uses cmake. Tested proper function of both `doxygen` and `doxygen_gui`.
Diffstat (limited to 'pkgs/development/tools/documentation')
| -rw-r--r-- | pkgs/development/tools/documentation/doxygen/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/development/tools/documentation/doxygen/tmake.patch | 23 |
2 files changed, 9 insertions, 53 deletions
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 82bbab5ff87..c843f0d2eef 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,45 +1,24 @@ -{ stdenv, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }: +{ stdenv, cmake, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }: -let - name = "doxygen-1.8.6"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "doxygen-1.8.11"; + src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0pskjlkbj76m9ka7zi66yj8ffjcv821izv3qxqyyphf0y0jqcwba"; + sha256 = "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35"; }; - prePatch = '' - substituteInPlace configure --replace /usr/bin/install $(type -P install) - ''; - - patches = [ ./tmake.patch ]; - + nativeBuildInputs = [ cmake ]; + buildInputs = [ perl python flex bison ] ++ stdenv.lib.optional (qt4 != null) qt4 ++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; - prefixKey = "--prefix "; - - configureFlags = - [ "--dot dot" ] - ++ stdenv.lib.optional stdenv.isSunOS "--install install" - ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; - - preConfigure = - '' - patchShebangs . - '' + stdenv.lib.optionalString (qt4 != null) - '' - echo "using QTDIR=${qt4}..." - export QTDIR=${qt4} - ''; - - makeFlags = "MAN1DIR=share/man/man1"; + cmakeFlags = + stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; enableParallelBuilding = true; diff --git a/pkgs/development/tools/documentation/doxygen/tmake.patch b/pkgs/development/tools/documentation/doxygen/tmake.patch deleted file mode 100644 index 4bba986c12c..00000000000 --- a/pkgs/development/tools/documentation/doxygen/tmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix the `check_unix' function, which looks for `/bin/uname' to determine -whether we're on a Unix-like system. - ---- doxygen-1.5.8/tmake/bin/tmake 2008-12-06 14:16:20.000000000 +0100 -+++ doxygen-1.5.8/tmake/bin/tmake 2009-03-05 11:29:55.000000000 +0100 -@@ -234,17 +234,7 @@ sub tmake_verb { - # - - sub check_unix { -- my($r); -- $r = 0; -- if ( -f "/bin/uname" ) { -- $r = 1; -- (-f "\\bin\\uname") && ($r = 0); -- } -- if ( -f "/usr/bin/uname" ) { -- $r = 1; -- (-f "\\usr\\bin\\uname") && ($r = 0); -- } -- return $r; -+ return 1; - } - |