samba: cleanup build configuration

pkgs/servers/samba/4.x.nix

@@ -1,9 +1,40 @@
-{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
+{ stdenv
+, fetchurl
+, python
+, pkgconfig
+, perl
+, libxslt
+, docbook_xsl
+, rpcgen
 , fixDarwinDylibNames
-, docbook_xml_dtd_42, readline
+, docbook_xml_dtd_42
-, popt, iniparser, libbsd, libarchive, libiconv, gettext
+, readline
-, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, liburing, fam, libceph, glusterfs
+, popt
-, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid
+, iniparser
+, libbsd
+, libarchive
+, libiconv
+, gettext
+, krb5Full
+, zlib
+, openldap
+, cups
+, pam
+, avahi
+, acl
+, libaio
+, liburing
+, fam
+, libceph
+, glusterfs
+, gnutls
+, ncurses
+, libunwind
+, systemd
+, jansson
+, lmdb
+, gpgme
+, libuuid
 
 , enableLDAP ? false
 , enablePrinting ? false
@@ -16,7 +47,7 @@
 , enablePam ? (!stdenv.isDarwin)
 }:
 
-with lib;
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "samba";
@@ -36,12 +67,33 @@ stdenv.mkDerivation rec {
     ./4.x-fix-makeflags-parsing.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig perl perl.pkgs.ParseYapp libxslt docbook_xsl docbook_xml_dtd_42 ]
+  nativeBuildInputs = [
-  ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
+    pkgconfig
+    perl
+    perl.pkgs.ParseYapp
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_42
+  ] ++ optionals stdenv.isDarwin [
+    rpcgen
+    fixDarwinDylibNames
+  ];
 
   buildInputs = [
-    python readline popt iniparser jansson
+    python
-    libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
+    readline
+    popt
+    iniparser
+    jansson
+    libbsd
+    libarchive
+    zlib
+    fam
+    libiconv
+    gettext
+    libunwind
+    krb5Full
+    gnutls
   ] ++ optionals stdenv.isLinux [ libaio liburing systemd ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
@@ -67,7 +119,7 @@ stdenv.mkDerivation rec {
     "--with-static-modules=NONE"
     "--with-shared-modules=ALL"
     "--with-system-mitkrb5"
-    "--with-system-mitkdc" krb5Full
+    "--with-system-mitkdc=${krb5Full}"
     "--enable-fhs"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
@@ -75,8 +127,10 @@ stdenv.mkDerivation rec {
   ] ++ singleton (if enableDomainController
          then "--with-experimental-mit-ad-dc"
          else "--without-ad-dc")
-    ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]
+    ++ optionals (!enableLDAP) [
-    ++ optional (!enableAcl) "--without-acl-support"
+    "--without-ldap"
+    "--without-ads"
+  ] ++ optional (!enableAcl) "--without-acl-support"
     ++ optional (!enablePam) "--without-pam";
 
   preBuild = ''