tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
discount: enable parallel builds
Sergei Trofimovich
4 years ago
d1bcd00c
92b0e341
+24
-1
2 changed files
expand all
collapse all
unified
split
pkgs
tools
text
discount
default.nix
parallel-make.patch
+9
-1
pkgs/tools/text/discount/default.nix
···
11
sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7";
12
};
13
14
-
patches = ./fix-configure-path.patch;
0
0
0
0
0
0
0
15
configureScript = "./configure.sh";
16
17
configureFlags = [
···
21
"--with-fenced-code"
22
];
23
0
24
doCheck = true;
25
26
meta = with lib; {
···
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 = [
···
28
"--with-fenced-code"
29
];
30
31
+
enableParallelBuilding = true;
32
doCheck = true;
33
34
meta = with lib; {
+15
pkgs/tools/text/discount/parallel-make.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
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