Merge pull request #97070 from obsidiansystems/lowdown-outputs
lowdown: Split out "bin" and "man" outputs
This commit is contained in:
commit
a75cc05fcf
|
@ -45,7 +45,7 @@ common =
|
||||||
[ autoreconfHook
|
[ autoreconfHook
|
||||||
autoconf-archive
|
autoconf-archive
|
||||||
bison flex
|
bison flex
|
||||||
lowdown mdbook
|
(lib.getBin lowdown) mdbook
|
||||||
jq
|
jq
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ common =
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isDarwin [ Security ]
|
++ lib.optionals stdenv.isDarwin [ Security ]
|
||||||
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
||||||
++ lib.optionals is24 [ libarchive gmock ]
|
++ lib.optionals is24 [ libarchive gmock lowdown ]
|
||||||
++ lib.optional withLibseccomp libseccomp
|
++ lib.optional withLibseccomp libseccomp
|
||||||
++ lib.optional withAWS
|
++ lib.optional withAWS
|
||||||
((aws-sdk-cpp.override {
|
((aws-sdk-cpp.override {
|
||||||
|
|
|
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||||
pname = "lowdown";
|
pname = "lowdown";
|
||||||
version = "0.7.9";
|
version = "0.7.9";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "lib" "dev" "man" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
|
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
|
||||||
|
@ -16,9 +16,12 @@ stdenv.mkDerivation rec {
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
./configure PREFIX=''${!outputDev} \
|
./configure PREFIX=''${!outputDev} \
|
||||||
BINDIR=''${!outputBin}/bin \
|
BINDIR=''${!outputBin}/bin \
|
||||||
MANDIR=''${!outputBin}/share/man
|
LIBDIR=''${!outputLib}/lib \
|
||||||
|
MANDIR=''${!outputMan}/share/man
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://kristaps.bsd.lv/lowdown/";
|
homepage = "https://kristaps.bsd.lv/lowdown/";
|
||||||
description = "Simple markdown translator";
|
description = "Simple markdown translator";
|
||||||
|
|
41
pkgs/tools/typesetting/lowdown/shared.patch
Normal file
41
pkgs/tools/typesetting/lowdown/shared.patch
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 955f737..2c9532c 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink"
|
||||||
|
REGRESS_ARGS += "--parse-no-cmark"
|
||||||
|
REGRESS_ARGS += "--parse-no-deflists"
|
||||||
|
|
||||||
|
-all: lowdown lowdown-diff lowdown.pc
|
||||||
|
+all: lowdown lowdown-diff liblowdown.so lowdown.pc
|
||||||
|
|
||||||
|
www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
|
||||||
|
|
||||||
|
@@ -101,6 +101,9 @@ lowdown-diff: lowdown
|
||||||
|
liblowdown.a: $(OBJS) $(COMPAT_OBJS)
|
||||||
|
$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
|
||||||
|
|
||||||
|
+liblowdown.so: $(OBJS) $(COMPAT_OBJS)
|
||||||
|
+ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
|
||||||
|
+
|
||||||
|
install: all
|
||||||
|
mkdir -p $(DESTDIR)$(BINDIR)
|
||||||
|
mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
|
||||||
|
@@ -111,7 +114,7 @@ install: all
|
||||||
|
$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
|
||||||
|
$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
|
||||||
|
$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
|
||||||
|
- $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
|
||||||
|
+ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
|
||||||
|
$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
|
||||||
|
for f in $(MANS) ; do \
|
||||||
|
name=`basename $$f .html` ; \
|
||||||
|
@@ -199,7 +202,7 @@ main.o: lowdown.h
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f $(OBJS) $(COMPAT_OBJS) main.o
|
||||||
|
- rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
|
||||||
|
+ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc
|
||||||
|
rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
|
||||||
|
rm -f $(PDFS) $(HTMLS) $(THUMBS)
|
||||||
|
|
Loading…
Reference in a new issue