me/guix
Archived
1
0
Fork 0
Code Activity

gnu: samba: Unbundle cmocka, heimdal; add gamin.

Browse source 
* gnu/packages/samba.scm (samba)[snippet]: Update comment.
[phases]{configure}: Remove '--bundled-libraries=com_err' argument.
[inputs]: Add cmocka, heimdal, gamin.  Remove TODO comment.
This commit is contained in:
Maxim Cournoyer 2020-11-02 17:03:57 -05:00
parent db29ee0b1b
commit 3185c29ac1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/samba.scm
View file

@ -45,6 +45,7 @@
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -189,7 +190,9 @@ external dependencies.")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; TODO: also remove the bundled ‘third_party/popt’. ;; XXX: Some bundled libraries (e.g, popt, cmocka) are used from
;; the system, but their bundled sources must be kept as they
;; include the WAF scripts used for detecting them.
(delete-file-recursively "third_party/pyiso8601") (delete-file-recursively "third_party/pyiso8601")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -211,14 +214,12 @@ external dependencies.")
(string-append all " $XML_CATALOG_FILES"))) (string-append all " $XML_CATALOG_FILES")))
#t)) #t))
(replace 'configure (replace 'configure
;; samba uses a custom configuration script that runs waf. ;; Samba uses a custom configuration script that runs WAF.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(libdir (string-append out "/lib"))) (libdir (string-append out "/lib")))
(invoke "./configure" (invoke "./configure"
"--enable-fhs" "--enable-fhs"
;; XXX: heimdal not packaged.
"--bundled-libraries=com_err"
(string-append "--prefix=" out) (string-append "--prefix=" out)
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
@ -235,13 +236,15 @@ external dependencies.")
;; smbpasswd, which fails with "smbpasswd -L can only be used by root." ;; smbpasswd, which fails with "smbpasswd -L can only be used by root."
;; So disable tests until there's a workaround. ;; So disable tests until there's a workaround.
#:tests? #f)) #:tests? #f))
(inputs ; TODO: Add missing dependencies (inputs
`(("acl" ,acl) `(("acl" ,acl)
("cmocka" ,cmocka)
("cups" ,cups) ("cups" ,cups)
;; ("gamin" ,gamin) ("gamin" ,gamin)
("dbus", dbus) ("dbus", dbus)
("gpgme" ,gpgme) ("gpgme" ,gpgme)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("heimdal" ,heimdal)
("jansson" ,jansson) ("jansson" ,jansson)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)