Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

doxygen: 1.8.19 -> 1.8.20 #102196

Merged
merged 1 commit into from Nov 7, 2020
Merged

doxygen: 1.8.19 -> 1.8.20 #102196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 13 additions & 15 deletions pkgs/development/tools/documentation/doxygen/default.nix
View file
Open in desktop
@@ -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 {

name = "doxygen-1.8.19";

src = fetchurl {
urls = [
"mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
"http://doxygen.nl/files/${name}.src.tar.gz"
];
sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc";
pname = "doxygen";
version = "1.8.20";

src = fetchFromGitHub {
owner = "doxygen";
repo = "doxygen";
rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh";
vcunat marked this conversation as resolved.
Show resolved Hide resolved
};

nativeBuildInputs = [
Expand All @@ -20,19 +19,18 @@ stdenv.mkDerivation rec {
];

buildInputs =
stdenv.lib.optional (qt4 != null) qt4
stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
++ stdenv.lib.optional stdenv.isSunOS libiconv
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];

cmakeFlags =
[ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++
stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES";
stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES";

NIX_CFLAGS_COMPILE =
stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";

enableParallelBuilding = true;
doCheck = false; # fails
enableParallelBuilding = false;

meta = {
license = stdenv.lib.licenses.gpl2Plus;
Expand All @@ -47,6 +45,6 @@ stdenv.mkDerivation rec {
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;
};
}
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Expand Up @@ -11024,11 +11024,11 @@ in
dot2tex = with python3.pkgs; toPythonApplication dot2tex;

doxygen = callPackage ../development/tools/documentation/doxygen {
qt4 = null;
qt5 = null;
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 { };

Expand Down