all: embrace unit packages where possible
This commit is contained in:
@ -1,35 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libhl";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xant";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "05mrp5rmki0wghdpmcgvsi8lqhfshifbmhp1qlkd89fb2srq91lf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
patches = [ ./fix-link.patch ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/include $out/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/xant/libhl";
|
||||
description = "Simple and fast C library implementing a thread-safe API to manage hash-tables, linked lists, lock-free ring buffers and queues ";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -1,13 +0,0 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 97b3901..4191da6 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -69,7 +69,7 @@ static: objects
|
||||
|
||||
.PHONY: shared
|
||||
shared: objects
|
||||
- ./libtool --mode=link $(CC) $(LIBS) $(LDFLAGS) -Wc,$(SHAREDFLAGS) -o $(builddir)/libhl.$(SHAREDEXT) $(builddir)/*.o
|
||||
+ ./libtool --mode=link $(CC) $(LIBS) $(LDFLAGS) -Wc,$(SHAREDFLAGS) -o $(builddir)/libhl.$(SHAREDEXT) .libs/*.o
|
||||
|
||||
%.o : $(srcdir)/src/%.c
|
||||
./libtool --mode=compile $(CC) -c $(CFLAGS) $< -o $(builddir)/$@
|
Reference in New Issue
Block a user