pyrox.dev
Merge pull request #173345 from McSinyx/discount-2.2.7b
discount: 2.2.7 -> 2.2.7b
authored by Sergei Trofimovich and committed by GitHub b4fe25d1 c5901505
+8
-16
pkgs/tools/text/discount/default.nix
+8
-16
pkgs/tools/text/discount/default.nix
···
1
{ lib, stdenv, fetchFromGitHub }:
2
3
stdenv.mkDerivation rec {
4
-
version = "2.2.7";
5
pname = "discount";
6
7
src = fetchFromGitHub {
8
owner = "Orc";
9
repo = pname;
10
rev = "v${version}";
11
-
sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7";
12
};
13
14
-
patches = [
15
-
./fix-configure-path.patch
16
-
17
-
# Fix parallel make depends:
18
-
# - https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch
19
-
# - https://github.com/Orc/discount/pull/245
20
-
./parallel-make.patch
21
-
];
22
configureScript = "./configure.sh";
23
-
24
configureFlags = [
25
-
"--enable-all-features"
26
-
"--pkg-config"
27
"--shared"
28
-
"--with-fenced-code"
29
-
# Use deterministic mangling
30
-
"--debian-glitch"
31
];
32
33
enableParallelBuilding = true;
34
doCheck = true;
35
36
postFixup = lib.optionalString stdenv.isDarwin ''
···
1
{ lib, stdenv, fetchFromGitHub }:
2
3
stdenv.mkDerivation rec {
4
+
version = "2.2.7b";
5
pname = "discount";
6
7
src = fetchFromGitHub {
8
owner = "Orc";
9
repo = pname;
10
rev = "v${version}";
11
+
sha256 = "sha256-S6OVKYulhvEPRqNXBsvZ7m2W4cbdnrpZKPAo3SfD+9s=";
12
};
13
14
+
patches = [ ./fix-configure-path.patch ];
15
configureScript = "./configure.sh";
16
configureFlags = [
17
"--shared"
18
+
"--debian-glitch" # use deterministic mangling
19
+
"--pkg-config"
20
+
"--h1-title"
21
];
22
23
enableParallelBuilding = true;
24
+
installTargets = [ "install.everything" ];
25
+
26
doCheck = true;
27
28
postFixup = lib.optionalString stdenv.isDarwin ''
-15
pkgs/tools/text/discount/parallel-make.patch
-15
pkgs/tools/text/discount/parallel-make.patch
···
1
-
https://github.com/Orc/discount/pull/245
2
-
https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch
3
-
4
-
Fix parallel make failure: add missing pandoc_headers dependency.
5
-
--- a/Makefile.in
6
-
+++ b/Makefile.in
7
-
@@ -139,7 +139,7 @@ test: $(PGMS) $(TESTFRAMEWORK) verify
8
-
9
-
pandoc_headers.o: tools/pandoc_headers.c config.h
10
-
$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
11
-
-pandoc_headers: pandoc_headers.o
12
-
+pandoc_headers: pandoc_headers.o $(COMMON) $(MKDLIB)
13
-
$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown
14
-
15
-
branch.o: tools/branch.c config.h
···