diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-02 12:18:58 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-02 12:18:58 +0200 |
| commit | 92af3ce417fdcb932c3f291e0c79106466a40c66 (patch) | |
| tree | 610d10ca5c4197c1a0ae14f1972dc72fb78a39d3 /gnu/packages/samba.scm | |
| parent | cb4b508cd68df89bfbd5255a0c5569f8318ad50f (diff) | |
| parent | 6e65eb3cad1d1148eade9ed2228cdea90d531a94 (diff) | |
| download | guix-patches-92af3ce417fdcb932c3f291e0c79106466a40c66.tar guix-patches-92af3ce417fdcb932c3f291e0c79106466a40c66.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/samba.scm')
| -rw-r--r-- | gnu/packages/samba.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index e10f00a83b..0ce46056f5 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -76,7 +76,7 @@ ;; The 6.7 tarball is missing ‘install.sh’. Create it. (add-after 'unpack 'autoreconf (lambda _ - (zero? (system* "autoreconf" "-i")))) + (invoke "autoreconf" "-i"))) (add-before 'configure 'set-root-sbin (lambda _ ; Don't try to install in "/sbin". (setenv "ROOTSBINDIR" @@ -150,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.2") + (version "4.8.3") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "08mz29jmjxqvyyhm6pa388paagw1i2i21lc7pd2aprj9dllm5rb2")))) + "1vc21c0m7wky70hpyjhw6ph6zlzljsvivlgxy54znpaxc259lmp0")))) (build-system gnu-build-system) (arguments `(#:phases @@ -178,8 +178,7 @@ anywhere.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (libdir (string-append out "/lib"))) - (zero? (system* - "./configure" + (invoke "./configure" "--enable-fhs" ;; XXX: heimdal not packaged. "--bundled-libraries=com_err" @@ -188,7 +187,7 @@ anywhere.") ;; 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" |