Merge pull request #292630 from alyssais/doxygen-spdlog

doxygen: unvendor spdlog

authored by Sandro and committed by GitHub 9685fb69 51d7d09c

+12 -1
+12 -1
pkgs/development/tools/documentation/doxygen/default.nix
··· 2 , stdenv 3 , cmake 4 , fetchFromGitHub 5 , python3 6 , flex 7 , bison 8 , qt5 9 , CoreServices 10 , libiconv 11 , sqlite 12 }: 13 ··· 22 sha256 = "sha256-FPI5ICdn9Tne/g9SP6jAQS813AAyoDNooDR/Hyvq6R4="; 23 }; 24 25 nativeBuildInputs = [ 26 cmake 27 python3 ··· 29 bison 30 ]; 31 32 - buildInputs = [ libiconv sqlite ] 33 ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) 34 ++ lib.optionals stdenv.isDarwin [ CoreServices ]; 35 36 cmakeFlags = [ 37 "-DICONV_INCLUDE_DIR=${libiconv}/include" 38 "-Duse_sys_sqlite3=ON" 39 ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; 40
··· 2 , stdenv 3 , cmake 4 , fetchFromGitHub 5 + , fetchpatch 6 , python3 7 , flex 8 , bison 9 , qt5 10 , CoreServices 11 , libiconv 12 + , spdlog 13 , sqlite 14 }: 15 ··· 24 sha256 = "sha256-FPI5ICdn9Tne/g9SP6jAQS813AAyoDNooDR/Hyvq6R4="; 25 }; 26 27 + patches = [ 28 + (fetchpatch { 29 + name = "sys-spdlog-fix.patch"; 30 + url = "https://github.com/doxygen/doxygen/commit/0df6da616f01057d28b11c8bee28443c102dd424.patch"; 31 + hash = "sha256-7efkCQFYGslwqhIuPsLYTEiA1rq+mO0DuyQBMt0O+m0="; 32 + }) 33 + ]; 34 + 35 nativeBuildInputs = [ 36 cmake 37 python3 ··· 39 bison 40 ]; 41 42 + buildInputs = [ libiconv spdlog sqlite ] 43 ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) 44 ++ lib.optionals stdenv.isDarwin [ CoreServices ]; 45 46 cmakeFlags = [ 47 "-DICONV_INCLUDE_DIR=${libiconv}/include" 48 + "-Duse_sys_spdlog=ON" 49 "-Duse_sys_sqlite3=ON" 50 ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; 51