siguix: samba-mod: modify input.

* siguix/packages/samba.scm (samba-mod): Add avahi to input list.

1 files changed, 74 insertions, 93 deletions

diff --git a/siguix/packages/samba.scm b/siguix/packages/samba.scm
index 7706e27..b9372a7 100644
--- a/siguix/packages/samba.scm
+++ b/siguix/packages/samba.scm
@@ -69,99 +69,80 @@
 (define-public samba-mod
   (package/inherit samba
     (name "samba-mod")
-    (arguments
-     `(#:make-flags '("TEST_OPTIONS=--quick") ;some tests are very long
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'setup-docbook-stylesheets
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; Append Samba's own DTDs to XML_CATALOG_FILES
-             ;; (c.f. docs-xml/build/README).
-             (copy-file "docs-xml/build/catalog.xml.in"
-                        "docs-xml/build/catalog.xml")
-             (substitute* "docs-xml/build/catalog.xml"
-               (("/@abs_top_srcdir@")
-                (string-append (getcwd) "/docs-xml")))
-             ;; Honor XML_CATALOG_FILES.
-             (substitute* "buildtools/wafsamba/wafsamba.py"
-               (("XML_CATALOG_FILES=\"\\$\\{SAMBA_CATALOGS\\}" all)
-                (string-append all " $XML_CATALOG_FILES")))
-             #t))
-         (replace 'configure
-           ;; Samba uses a custom configuration script that runs WAF.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out    (assoc-ref outputs "out"))
-                    (libdir (string-append out "/lib")))
-               (invoke "./configure"
-                       "--enable-selftest"
-                       "--enable-fhs"
-                       (string-append "--prefix=" out)
-                       "--sysconfdir=/etc"
-                       "--localstatedir=/var"
-                       ;; Install public and private libraries into
-                       ;; a single directory to avoid RPATH issues.
-                       (string-append "--libdir=" libdir)
-                       (string-append "--with-privatelibdir=" libdir)
-                       ;; Build samba instead with mit-krb5
-                       "--with-system-mitkrb5"
-                       (string-append "--with-system-mitkdc="
-                                      (assoc-ref %build-inputs "mit-krb5"))
-                       "--with-experimental-mit-ad-dc"))))
-         (add-before 'install 'disable-etc,var-samba-directories-setup
-           (lambda _
-             (substitute* "dynconfig/wscript"
-               (("bld\\.INSTALL_DIR.*") ""))
-             #t))
-         (add-after 'install 'wrap-program
-           ;; Some samba tools selectively fail to find talloc, tdb
-           ;; and dnspython.
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (string-append (assoc-ref outputs "out")))
-                   (talloc (string-append (assoc-ref inputs "talloc")
-                                          "/lib/python3.9/site-packages"))
-                   (tdb (string-append (assoc-ref inputs "tdb")
-                                       "/lib/python3.9/site-packages"))
-                   (python-dnspython (string-append
-                                      (assoc-ref inputs "python-dnspython")
-                                      "/lib/python3.9/site-packages")))
-               (for-each
-                (lambda (bin)
-                  (wrap-program (string-append out bin)
-                    `("PYTHONPATH" prefix (,talloc ,tdb ,python-dnspython))))
-                '("/bin/samba-tool"
-                  "/sbin/samba-gpupdate"
-                  "/sbin/samba_dnsupdate"
-                  "/sbin/samba_downgrade_db"
-                  "/sbin/samba_kcc"
-                  "/sbin/samba_spnupdate"
-                  "/sbin/samba_upgradedns"))))))
-       ;; FIXME: The test suite seemingly hangs after failing to provision the
-       ;; test environment.
-       #:tests? #f))
-    (inputs
-     (list acl
-           cmocka
-           cups
-           gamin
-           dbus
-           gpgme
-           gnutls
-           ;; heimdal
-           jansson
-           libarchive
-           libtirpc
-           linux-pam
-           lmdb
-           openldap
-           perl
-           python
-           popt
-           readline
-           tdb
-           avahi                        ;new!
-           mit-krb5                     ;new!
-           python-dnspython             ;add missing dns module
-           ))))
+    ;; (arguments
+    ;;  `(#:make-flags '("TEST_OPTIONS=--quick") ;some tests are very long
+    ;;    #:phases
+    ;;    (modify-phases %standard-phases
+    ;;      (add-before 'configure 'setup-docbook-stylesheets
+    ;;        (lambda* (#:key inputs #:allow-other-keys)
+    ;;          ;; Append Samba's own DTDs to XML_CATALOG_FILES
+    ;;          ;; (c.f. docs-xml/build/README).
+    ;;          (copy-file "docs-xml/build/catalog.xml.in"
+    ;;                     "docs-xml/build/catalog.xml")
+    ;;          (substitute* "docs-xml/build/catalog.xml"
+    ;;            (("/@abs_top_srcdir@")
+    ;;             (string-append (getcwd) "/docs-xml")))
+    ;;          ;; Honor XML_CATALOG_FILES.
+    ;;          (substitute* "buildtools/wafsamba/wafsamba.py"
+    ;;            (("XML_CATALOG_FILES=\"\\$\\{SAMBA_CATALOGS\\}" all)
+    ;;             (string-append all " $XML_CATALOG_FILES")))
+    ;;          #t))
+    ;;      (replace 'configure
+    ;;        ;; Samba uses a custom configuration script that runs WAF.
+    ;;        (lambda* (#:key outputs #:allow-other-keys)
+    ;;          (let* ((out    (assoc-ref outputs "out"))
+    ;;                 (libdir (string-append out "/lib")))
+    ;;            (invoke "./configure"
+    ;;                    "--enable-selftest"
+    ;;                    "--enable-fhs"
+    ;;                    (string-append "--prefix=" out)
+    ;;                    "--sysconfdir=/etc"
+    ;;                    "--localstatedir=/var"
+    ;;                    ;; Install public and private libraries into
+    ;;                    ;; a single directory to avoid RPATH issues.
+    ;;                    (string-append "--libdir=" libdir)
+    ;;                    (string-append "--with-privatelibdir=" libdir)
+    ;;                    ;; Build samba instead with mit-krb5
+    ;;                    "--with-system-mitkrb5"
+    ;;                    (string-append "--with-system-mitkdc="
+    ;;                                   (assoc-ref %build-inputs "mit-krb5"))
+    ;;                    "--with-experimental-mit-ad-dc"))))
+    ;;      (add-before 'install 'disable-etc,var-samba-directories-setup
+    ;;        (lambda _
+    ;;          (substitute* "dynconfig/wscript"
+    ;;            (("bld\\.INSTALL_DIR.*") ""))
+    ;;          #t))
+    ;;      (add-after 'install 'wrap-program
+    ;;        ;; Some samba tools selectively fail to find talloc, tdb
+    ;;        ;; and dnspython.
+    ;;        (lambda* (#:key inputs outputs #:allow-other-keys)
+    ;;          (let ((out (string-append (assoc-ref outputs "out")))
+    ;;                (talloc (string-append (assoc-ref inputs "talloc")
+    ;;                                       "/lib/python3.9/site-packages"))
+    ;;                (tdb (string-append (assoc-ref inputs "tdb")
+    ;;                                    "/lib/python3.9/site-packages"))
+    ;;                (python-dnspython (string-append
+    ;;                                   (assoc-ref inputs "python-dnspython")
+    ;;                                   "/lib/python3.9/site-packages")))
+    ;;            (for-each
+    ;;             (lambda (bin)
+    ;;               (wrap-program (string-append out bin)
+    ;;                 `("PYTHONPATH" prefix (,talloc ,tdb ,python-dnspython))))
+    ;;             '("/bin/samba-tool"
+    ;;               "/sbin/samba-gpupdate"
+    ;;               "/sbin/samba_dnsupdate"
+    ;;               "/sbin/samba_downgrade_db"
+    ;;               "/sbin/samba_kcc"
+    ;;               "/sbin/samba_spnupdate"
+    ;;               "/sbin/samba_upgradedns"))))))
+    ;;    ;; FIXME: The test suite seemingly hangs after failing to provision the
+    ;;    ;; test environment.
+    ;;    #:tests? #f))
+    (inputs (modify-inputs (package-inputs samba)
+              (append avahi
+                      ;; mit-krb5 ;new!
+                      ;; python-dnspython ;add missing dns module
+                      )))))
 
 (define-public wsdd
   (package