Merge pull request #173345 from McSinyx/discount-2.2.7b

discount: 2.2.7 -> 2.2.7b
This commit is contained in:
Sergei Trofimovich 2022-05-17 06:17:23 +00:00 committed by GitHub
commit b4fe25d161
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 31 deletions

View file

@ -1,36 +1,28 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2.2.7";
version = "2.2.7b";
pname = "discount";
src = fetchFromGitHub {
owner = "Orc";
repo = pname;
rev = "v${version}";
sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7";
sha256 = "sha256-S6OVKYulhvEPRqNXBsvZ7m2W4cbdnrpZKPAo3SfD+9s=";
};
patches = [
./fix-configure-path.patch
# Fix parallel make depends:
# - https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch
# - https://github.com/Orc/discount/pull/245
./parallel-make.patch
];
patches = [ ./fix-configure-path.patch ];
configureScript = "./configure.sh";
configureFlags = [
"--enable-all-features"
"--pkg-config"
"--shared"
"--with-fenced-code"
# Use deterministic mangling
"--debian-glitch"
"--debian-glitch" # use deterministic mangling
"--pkg-config"
"--h1-title"
];
enableParallelBuilding = true;
installTargets = [ "install.everything" ];
doCheck = true;
postFixup = lib.optionalString stdenv.isDarwin ''

View file

@ -1,15 +0,0 @@
https://github.com/Orc/discount/pull/245
https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch
Fix parallel make failure: add missing pandoc_headers dependency.
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,7 +139,7 @@ test: $(PGMS) $(TESTFRAMEWORK) verify
pandoc_headers.o: tools/pandoc_headers.c config.h
$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
-pandoc_headers: pandoc_headers.o
+pandoc_headers: pandoc_headers.o $(COMMON) $(MKDLIB)
$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown
branch.o: tools/branch.c config.h