diff options
| author | Simon Streit <simon@netpanic.org> | 2021-12-31 01:50:45 +0100 |
|---|---|---|
| committer | Simon Streit <simon@netpanic.org> | 2022-01-06 00:10:09 +0100 |
| commit | c11f01407d109f4bf598a6db8d026918fdbc0da5 (patch) | |
| tree | f9a37548df98f15db206ac47c5046f1efbd381cd | |
| parent | 02e8714a8f6c50fb4df8f15871150ffa049d18e5 (diff) | |
siguix: wrap certain binaries in samba to find talloc.
| -rw-r--r-- | siguix/packages/samba.scm | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/siguix/packages/samba.scm b/siguix/packages/samba.scm index 3ec4423..5fac51e 100644 --- a/siguix/packages/samba.scm +++ b/siguix/packages/samba.scm @@ -1,4 +1,15 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013, 2015, 2017, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> +;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> +;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Simon Streit <simon@netpanic.org> ;;; ;;; This file is NOT part of GNU Guix. @@ -55,7 +66,6 @@ #:use-module (gnu packages xml)) (define-public samba-mod - ;; Add avahi to inputs (package/inherit samba (name "samba-mod") (arguments @@ -100,14 +110,31 @@ (lambda _ (substitute* "dynconfig/wscript" (("bld\\.INSTALL_DIR.*") "")) - #t))) + #t)) + (add-after 'install 'wrap-program + ;; samba-tools and others fail to find talloc + (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"))) + (for-each + (lambda (bin) + (wrap-program (string-append out bin) + `("PYTHONPATH" prefix (,talloc ,tdb)))) + '("/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 - avahi ;new! - mit-krb5 ;new! cmocka cups gamin @@ -125,4 +152,7 @@ python popt readline - tdb)))) + tdb + avahi ;new! + mit-krb5 ;new! + )))) |