Merge pull request #227463 from foo-dogsquared/split-guile-gnutls

pkgs/development/guile-modules/guile-gnutls/default.nix

@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchurl
+, gnutls
+, guile
+, libtool
+, pkg-config
+, texinfo
+}:
+
+stdenv.mkDerivation rec {
+  pname = "guile-gnutls";
+  version = "3.7.11";
+
+  src = fetchurl {
+    url = "mirror://gnu/gnutls/guile-gnutls-${version}.tar.gz";
+    hash = "sha256-BY6qXHY+Gfv5PotO78ESgPgHBTXBOMmb4R8AzWhWE98=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    gnutls
+    guile
+    libtool
+    texinfo
+  ];
+
+  configureFlags = [
+    "--with-guile-site-dir=${builtins.placeholder "out"}/share/guile/site"
+    "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/share/guile/site"
+    "--with-guile-extension-dir=${builtins.placeholder "out"}/share/guile/extensions"
+  ];
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/gnutls/guile/";
+    description = "Guile bindings for GnuTLS library";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ foo-dogsquared ];
+    platforms = platforms.linux;
+  };
+}

pkgs/development/libraries/gnutls/default.nix

@@ -2,7 +2,6 @@
 , perl, gmp, autoconf, automake, libidn2, libiconv
 , unbound, dns-root-data, gettext, util-linux
 , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so
-, guileBindings ? config.gnutls.guile or false, guile
 , tpmSupport ? false, trousers, which, nettools, libunistring
 , withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit
 , Security  # darwin Security.framework
@@ -22,7 +21,6 @@
 , samba
 }:
 
-assert guileBindings -> guile != null;
 let
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
@@ -74,19 +72,13 @@ stdenv.mkDerivation rec {
     "--with-unbound-root-key-file=${dns-root-data}/root.key"
     (lib.withFeature withP11-kit "p11-kit")
     (lib.enableFeature cxxBindings "cxx")
-  ] ++ lib.optionals guileBindings [
-    "--enable-guile"
-    "--with-guile-site-dir=\${out}/share/guile/site"
-    "--with-guile-site-ccache-dir=\${out}/share/guile/site"
-    "--with-guile-extension-dir=\${out}/share/guile/site"
   ];
 
   enableParallelBuilding = true;
 
   buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ]
     ++ lib.optional (withP11-kit) p11-kit
-    ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
-    ++ lib.optional guileBindings guile;
+    ++ lib.optional (tpmSupport && stdenv.isLinux) trousers;
 
   nativeBuildInputs = [ perl pkg-config ]
     ++ lib.optionals doCheck [ which nettools util-linux ];

pkgs/top-level/all-packages.nix

@@ -17247,6 +17247,8 @@ with pkgs;
 
   guile-git = callPackage ../development/guile-modules/guile-git { };
 
+  guile-gnutls = callPackage ../development/guile-modules/guile-gnutls { };
+
   guile-json = callPackage ../development/guile-modules/guile-json { };
 
   guile-lib = callPackage ../development/guile-modules/guile-lib { };