doxygen: 1.8.19 -> 1.8.20

also move doxygen_gui to qt5 and modernize the expression a bit

enableParallel was disabled, since it reproducably failed on my
dual-socket Xeon machine
This commit is contained in:
ajs124 2020-10-30 16:44:08 +01:00
parent 6a1782986d
commit 1f75b60c56
2 changed files with 14 additions and 16 deletions

View file

@ -1,15 +1,14 @@
{ stdenv, cmake, fetchurl, python3, flex, bison, qt4, CoreServices, libiconv }: { stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "doxygen";
version = "1.8.20";
name = "doxygen-1.8.19"; src = fetchFromGitHub {
owner = "doxygen";
src = fetchurl { repo = "doxygen";
urls = [ rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
"mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh";
"http://doxygen.nl/files/${name}.src.tar.gz"
];
sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -20,19 +19,18 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = buildInputs =
stdenv.lib.optional (qt4 != null) qt4 stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
++ 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 ];
cmakeFlags = cmakeFlags =
[ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++
stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES";
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
enableParallelBuilding = true; enableParallelBuilding = false;
doCheck = false; # fails
meta = { meta = {
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
@ -47,6 +45,6 @@ stdenv.mkDerivation rec {
manual (in LaTeX) from a set of documented source files. manual (in LaTeX) from a set of documented source files.
''; '';
platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
}; };
} }

View file

@ -11024,11 +11024,11 @@ in
dot2tex = with python3.pkgs; toPythonApplication dot2tex; dot2tex = with python3.pkgs; toPythonApplication dot2tex;
doxygen = callPackage ../development/tools/documentation/doxygen { doxygen = callPackage ../development/tools/documentation/doxygen {
qt4 = null; qt5 = null;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
}; };
doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); doxygen_gui = lowPrio (doxygen.override { inherit qt5; });
drake = callPackage ../development/tools/build-managers/drake { }; drake = callPackage ../development/tools/build-managers/drake { };