civodul pushed a commit to branch master
in repository guix.
commit c451474488a2a9497ba4f839b90b0eff643d1945
Author: Adonay Felipe Nogueira <[email protected]>
Date: Sat Dec 3 21:22:56 2016 -0200
gnu: samba: Don't expect configuration files inside the store.
Fixes <http://bugs.gnu.org/24834>.
* gnu/packages/samba.scm (samba)[arguments]: Add --sysconfdir configure
flag.
Add 'disable-etc-samba-directory-creation' phase.
Signed-off-by: Ludovic Courtès <[email protected]>
---
gnu/packages/samba.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 1706ec3..913d5f7 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013, 2015 Ludovic Courtès <[email protected]>
;;; Copyright © 2015 Mark H Weaver <[email protected]>
;;; Copyright © 2016 Efraim Flashner <[email protected]>
+;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -121,11 +122,16 @@ anywhere.")
;; XXX: heimdal not packaged.
"--bundled-libraries=com_err"
(string-append "--prefix=" out)
+ "--sysconfdir=/etc"
;; Install public and private libraries into
;; a single directory to avoid RPATH issues.
(string-append "--libdir=" libdir)
- (string-append "--with-privatelibdir=" libdir)))))))
-
+ (string-append "--with-privatelibdir=" libdir))))))
+ (add-before 'install 'disable-etc-samba-directory-creation
+ (lambda _
+ (substitute* "dynconfig/wscript"
+
(("bld\\.INSTALL_DIRS\\(\"\",[[:blank:]]{1,}\"\\$\\{CONFIGDIR\\}[[:blank:]]{1,}")
+ "bld.INSTALL_DIRS(\"\", \"")))))
;; XXX: The test infrastructure attempts to set password with
;; smbpasswd, which fails with "smbpasswd -L can only be used by root."
;; So disable tests until there's a workaround.
