diff options
-rw-r--r-- | pkgs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tcl-cmark/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tcl-cmark/fix-gfm-extension-name.patch | 19 |
3 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 6670ebd..b33502e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,6 +3,8 @@ pkgs: { # duksebot = pkgs.callPackage ./duksebot { }; + tcl-cmark = pkgs.callPackage ./tcl-cmark { }; + still-awake = pkgs.callPackage ./still-awake { }; # Use patched version from Karl. diff --git a/pkgs/tcl-cmark/default.nix b/pkgs/tcl-cmark/default.nix new file mode 100644 index 0000000..ccbf0ff --- /dev/null +++ b/pkgs/tcl-cmark/default.nix @@ -0,0 +1,25 @@ +{ tcl +, pkg-config +, autoreconfHook +, cmark-gfm +, fetchFromGitHub +}: + +tcl.mkTclDerivation { + pname = "tcl-cmark"; + version = "2022-03-15"; + + src = fetchFromGitHub { + owner = "apnadkarni"; + repo = "tcl-cmark"; + rev = "b8e203fe48f2b717365c5c58a2908019b2f36f8b"; + hash = "sha256-wXr/sDIh4o8l+21ALb7CDPnYsExr9p7IZ6Kg5tAOGHs="; + }; + + patches = [ + ./fix-gfm-extension-name.patch + ]; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ cmark-gfm ]; +} diff --git a/pkgs/tcl-cmark/fix-gfm-extension-name.patch b/pkgs/tcl-cmark/fix-gfm-extension-name.patch new file mode 100644 index 0000000..d907da7 --- /dev/null +++ b/pkgs/tcl-cmark/fix-gfm-extension-name.patch @@ -0,0 +1,19 @@ +diff --git a/tclcmark.m4 b/tclcmark.m4 +index e94b746..6b91920 100644 +--- a/tclcmark.m4 ++++ b/tclcmark.m4 +@@ -19,10 +19,10 @@ AC_DEFUN(TCLCMARK_LOCATE_CMARK, [ + AC_MSG_RESULT([found]) + if test "${TEA_PLATFORM}" = "windows" ; then + CMARK_CFLAGS="`pkg-config --cflags libcmark-gfm`" +- CMARK_LIBS="-Wl,-Bstatic `pkg-config --static --libs libcmark-gfm` -lcmark-gfmextensions -Wl,-Bdynamic" ++ CMARK_LIBS="-Wl,-Bstatic `pkg-config --static --libs libcmark-gfm` -lcmark-gfm-extensions -Wl,-Bdynamic" + else + CMARK_CFLAGS="`pkg-config --cflags libcmark-gfm`" +- CMARK_LIBS="`pkg-config --libs libcmark-gfm` -lcmark-gfmextensions" ++ CMARK_LIBS="`pkg-config --libs libcmark-gfm` -lcmark-gfm-extensions" + fi + fi + +-- +2.40.1 |