ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13856 from jraygauthier/jrg/update_doxygen_from_186_to_1811

Browse Source 
doxygen: 1.8.6 -> 1.8.11
This commit is contained in:
Peter Simons 2016-03-17 19:15:28 +01:00
commit 5af4afb36b
2 changed files with 9 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,15 @@
{ stdenv, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }: { stdenv, cmake, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }:
let stdenv.mkDerivation rec {
name = "doxygen-1.8.6";
in name = "doxygen-1.8.11";
stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
sha256 = "0pskjlkbj76m9ka7zi66yj8ffjcv821izv3qxqyyphf0y0jqcwba"; sha256 = "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35";
}; };
prePatch = '' nativeBuildInputs = [ cmake ];
substituteInPlace configure --replace /usr/bin/install $(type -P install)
'';
patches = [ ./tmake.patch ];
buildInputs = buildInputs =
[ perl python flex bison ] [ perl python flex bison ]
@ -23,23 +17,8 @@ stdenv.mkDerivation {
++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optional stdenv.isSunOS libiconv
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
prefixKey = "--prefix "; cmakeFlags =
stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES";
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";
enableParallelBuilding = true; enableParallelBuilding = true;

23
pkgs/development/tools/documentation/doxygen/tmake.patch
View File

@ -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;
}