From 312fbe845800474766076d41a4c9cf2956a221ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Jun 2021 13:35:24 +0000 Subject: [PATCH] cmark: 0.29.0 -> 0.30.0; dynamically link; cleanup --- pkgs/development/libraries/cmark/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 6061fd8f9123..ec90d0086c9d 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,18 +1,26 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.29.0"; pname = "cmark"; + version = "0.30.0"; src = fetchFromGitHub { owner = "jgm"; - repo = "cmark"; + repo = pname; rev = version; - sha256 = "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f"; + sha256 = "sha256-SU31kJL+8wt57bGW5fNeXjXPgPeCXZIknZwDxMXCfdc="; }; nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # https://github.com/commonmark/cmark/releases/tag/0.30.0 + # recommends distributions dynamically link + "-DCMARK_STATIC=OFF" + ]; + doCheck = !stdenv.isDarwin; + preCheck = '' export LD_LIBRARY_PATH=$(readlink -f ./src) '';