From 224fc9d138b7eccf31da551ee035367740299adb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Aug 2022 02:37:24 +0200 Subject: [PATCH] =?UTF-8?q?editorconfig-core-c:=200.12.1=20=E2=86=92=200.1?= =?UTF-8?q?2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ported to PCRE2. https://github.com/editorconfig/editorconfig-core-c/releases/tag/v0.12.2 https://github.com/editorconfig/editorconfig-core-c/releases/tag/v0.12.3 https://github.com/editorconfig/editorconfig-core-c/releases/tag/v0.12.4 https://github.com/editorconfig/editorconfig-core-c/releases/tag/v0.12.5 --- .../misc/editorconfig-core-c/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index 893a1925dd71..f46e840276ff 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,22 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pcre, doxygen }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, pcre2, doxygen }: stdenv.mkDerivation rec { pname = "editorconfig-core-c"; - version = "0.12.1"; + version = "0.12.5"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-core-c"; rev = "v${version}"; - sha256 = "sha256-pFsbyqIt7okfaiOwlYN8EXm1SFlCUnsHVbOgyIZZlys="; + sha256 = "sha256-4p8bomeXtA+zJ3IvWW0UZixdMnjYWYu7yeA6JUwwRb8="; fetchSubmodules = true; }; - buildInputs = [ pcre ]; - nativeBuildInputs = [ cmake doxygen ]; + patches = [ + # Fox broken paths in pkg-config. + # https://github.com/editorconfig/editorconfig-core-c/pull/81 + (fetchpatch { + url = "https://github.com/editorconfig/editorconfig-core-c/commit/e0ead79d3bb4179fe9bccd3e5598ed47cc0863a3.patch"; + sha256 = "t/DiPVyyYoMwFpNG6sD+rLWHheFCbMaILXyey6inGdc="; + }) + ]; + + nativeBuildInputs = [ + cmake + doxygen + ]; + + buildInputs = [ + pcre2 + ]; # Multiple doxygen can not generate man pages in the same base directory in - # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153 + # parallel: https://github.com/doxygen/doxygen/issues/6293 enableParallelBuilding = false; meta = with lib; {