git.iko.soy/typeable/nixpkgs
on master help sign in
lowdown: Split out "lib" and "man" outputs

Also fix to not always static link

commit0ceadf99f221cf461efa9edb34424ff6ad375119 authorJohn Ericson <git@JohnEricson.me> dateThu 3 Sep 2020, 22:47 (6 years ago) parent12881a7
3 files changed+48−4
pkgs/tools/package-management/nix/default.nix+2−2 pkgs/tools/typesetting/lowdown/default.nix+5−2 pkgs/tools/typesetting/lowdown/shared.patch+41
pkgs/tools/package-management/nix/default.nix+2−2
@@ -45,7 +45,7 @@ common =
4545 [ autoreconfHook
4646 autoconf-archive
4747 bison flex
48− lowdown mdbook
48+ (lib.getBin lowdown) mdbook
4949 jq
5050 ];
5151
@@ -55,7 +55,7 @@ common =
5555 ]
5656 ++ lib.optionals stdenv.isDarwin [ Security ]
5757 ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
58− ++ lib.optionals is24 [ libarchive gmock ]
58+ ++ lib.optionals is24 [ libarchive gmock lowdown ]
5959 ++ lib.optional withLibseccomp libseccomp
6060 ++ lib.optional withAWS
6161 ((aws-sdk-cpp.override {
pkgs/tools/typesetting/lowdown/default.nix+5−2
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
44 pname = "lowdown";
55 version = "0.7.9";
66
7− outputs = [ "out" "dev" ];
7+ outputs = [ "out" "lib" "dev" "man" ];
88
99 src = fetchurl {
1010 url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
@@ -16,9 +16,12 @@ stdenv.mkDerivation rec {
1616 configurePhase = ''
1717 ./configure PREFIX=''${!outputDev} \
1818 BINDIR=''${!outputBin}/bin \
19− MANDIR=''${!outputBin}/share/man
19+ LIBDIR=''${!outputLib}/lib \
20+ MANDIR=''${!outputMan}/share/man
2021 '';
2122
23+ patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;
24+
2225 meta = with lib; {
2326 homepage = "https://kristaps.bsd.lv/lowdown/";
2427 description = "Simple markdown translator";
pkgs/tools/typesetting/lowdown/shared.patchnew file+41
@@ -0,0 +1,41 @@
1+diff --git a/Makefile b/Makefile
2+index 955f737..2c9532c 100644
3+--- a/Makefile
4++++ b/Makefile
5+@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink"
6+ REGRESS_ARGS += "--parse-no-cmark"
7+ REGRESS_ARGS += "--parse-no-deflists"
8+
9+-all: lowdown lowdown-diff lowdown.pc
10++all: lowdown lowdown-diff liblowdown.so lowdown.pc
11+
12+ www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
13+
14+@@ -101,6 +101,9 @@ lowdown-diff: lowdown
15+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
16+ $(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
17+
18++liblowdown.so: $(OBJS) $(COMPAT_OBJS)
19++ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
20++
21+ install: all
22+ mkdir -p $(DESTDIR)$(BINDIR)
23+ mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
24+@@ -111,7 +114,7 @@ install: all
25+ $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
26+ $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
27+ $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
28+- $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
29++ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
30+ $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
31+ for f in $(MANS) ; do \
32+ name=`basename $$f .html` ; \
33+@@ -199,7 +202,7 @@ main.o: lowdown.h
34+
35+ clean:
36+ rm -f $(OBJS) $(COMPAT_OBJS) main.o
37+- rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
38++ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc
39+ rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
40+ rm -f $(PDFS) $(HTMLS) $(THUMBS)
41+