Merge #22751: lmdb: split outputs, share lib, ...

pkgs/development/libraries/lmdb/default.nix

@@ -14,14 +14,28 @@ in stdenv.mkDerivation rec {
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
 
-  makeFlags = ["prefix=$(out)"]
+  outputs = [ "bin" "out" "dev" ];
-              ++ optional stdenv.cc.isClang "CC=clang";
+
+  makeFlags = [ "prefix=$(out)" "CC=cc" ];
 
   doCheck = true;
   checkPhase = "make test";
 
-  preInstall = ''
+  postInstall = ''
-    mkdir -p $out/{bin,lib,include}
+    moveToOutput bin "$bin"
+    moveToOutput "lib/*.a" REMOVE # until someone needs it
+  ''
+    # add lmdb.pc (dynamic only)
+    + ''
+    mkdir -p "$dev/lib/pkgconfig"
+    cat > "$dev/lib/pkgconfig/lmdb.pc" <<EOF
+    Name: lmdb
+    Description: ${meta.description}
+    Version: ${version}
+
+    Cflags: -I$dev/include
+    Libs: -L$out/lib -llmdb
+    EOF
   '';
 
   meta = with stdenv.lib; {
@@ -34,7 +48,7 @@ in stdenv.mkDerivation rec {
       limited to the size of the virtual address space.
     '';
     homepage = http://symas.com/mdb/;
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ jb55 vcunat ];
     license = licenses.openldap;
     platforms = platforms.all;
   };

pkgs/servers/dns/knot-dns/default.nix

@@ -16,15 +16,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu libidn
+    gnutls jansson liburcu libidn lmdb
     nettle libedit
     libiconv
     # without sphinx &al. for developer documentation
   ]
     # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ]
     ++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
+  configureFlags = [ "--with-lmdb=${stdenv.lib.getLib lmdb}"/*not perfect*/ ];
+
   enableParallelBuilding = true;
 
   CFLAGS = [ "-O2" "-DNDEBUG" ];

pkgs/servers/dns/knot-resolver/default.nix

@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
 
-  buildInputs = [ knot-dns luajit libuv gnutls ]
+  buildInputs = [ knot-dns lmdb luajit libuv gnutls ]
-    # TODO: lmdb needs lmdb.pc; embedded for now
     ## optional dependencies
     ++ optional doInstallCheck cmocka
     ++ optional stdenv.isLinux systemd # socket activation