diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-08-10 02:37:24 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-08-12 20:55:55 +0200 |
| commit | 224fc9d138b7eccf31da551ee035367740299adb (patch) | |
| tree | ac43ffbc95419e48661e673c3c4bd0dd3037e3fd /pkgs/development/tools/misc | |
| parent | 5b93ac113cf117eea5ef064651d980509174e6d2 (diff) | |
editorconfig-core-c: 0.12.1 → 0.12.5
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
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/editorconfig-core-c/default.nix | 29 |
1 files 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 893a1925dd710..f46e840276ff9 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; { |