mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge pull request #13856 from jraygauthier/jrg/update_doxygen_from_186_to_1811
doxygen: 1.8.6 -> 1.8.11
This commit is contained in:
commit
5af4afb36b
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user