ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: samba: Don't expect configuration files inside the store.

Browse source 
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 <ludo@gnu.org>
This commit is contained in:
Adonay Felipe Nogueira 2016-12-03 21:22:56 -02:00 committed by Ludovic Courtès
parent 35cdc267ae
commit c451474488
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/samba.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -121,11 +122,16 @@ (define-public samba
;; 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.