Merge pull request #195076 from anthonyroussel/adcli_0_9_2

adcli: 0.9.1 -> 0.9.2

pkgs/os-specific/linux/adcli/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitLab
-, fetchpatch
 , openldap
 , libkrb5
 , libxslt
@@ -16,25 +15,33 @@
 
 stdenv.mkDerivation rec {
   pname = "adcli";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "realmd";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Zzt4qgLiJNuSrbtDWuxJEfGL7sWSbqN301q3qXZpn9c=";
+    sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
   };
 
-  # https://bugs.gentoo.org/820224
-  # Without this it produces some weird missing symbol error in glibc
-  patches = [
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch?id=01db544de893262e857685e11b33c2a74210181f";
-      sha256 = "sha256-dZ6dkzxd+0XjY/X9/2IWMan3syvCDGFHiMbxFxMHGFA=";
-    })
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    docbook_xsl
+    util-linux
+    xmlto
   ];
 
+  buildInputs = [
+    openldap
+    libkrb5
+    libxslt
+    cyrus_sasl
+  ];
+
+  configureFlags = [ "--disable-debug" ];
+
   postPatch = ''
     substituteInPlace tools/Makefile.am \
       --replace 'sbin_PROGRAMS' 'bin_PROGRAMS'
@@ -43,7 +50,7 @@ stdenv.mkDerivation rec {
         --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
                   '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'
 
-    function patch_docbook(){
+    function patch_docbook() {
       substituteInPlace $1 \
         --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
                   "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
@@ -52,17 +59,12 @@ stdenv.mkDerivation rec {
     patch_docbook doc/adcli-devel.xml
     patch_docbook doc/adcli-docs.xml
   '';
-  nativeBuildInputs = [ autoreconfHook pkg-config docbook_xsl ];
-
-  buildInputs = [ openldap libkrb5 libxslt cyrus_sasl util-linux xmlto docbook_xsl ];
-
-  configureFlags = [ "--disable-debug" ];
 
   meta = with lib; {
     homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html";
     description = "A helper library and tools for Active Directory client operations.";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ SohamG ];
+    maintainers = with maintainers; [ SohamG anthonyroussel ];
     platforms = platforms.linux;
   };
 }