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

gnu: qemu: Remove dependency on Samba.

Browse source 
* gnu/packages/qemu.scm (qemu-headless)[inputs]: Remove SAMBA.
  [arguments]: Remove --smbd configure flag.
This commit is contained in:
Ludovic Courtès 2014-06-16 10:47:36 +02:00
parent 7190ae7743
commit b344c505f4
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/qemu.scm
View file

@ -34,7 +34,6 @@ (define-module (gnu packages qemu)
#:use-module (gnu packages libjpeg) #:use-module (gnu packages libjpeg)
#:use-module (gnu packages attr) #:use-module (gnu packages attr)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages samba)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
@ -59,8 +58,7 @@ (define-public qemu-headless
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; The `configure' script doesn't understand some of the ;; The `configure' script doesn't understand some of the
;; GNU options. Thus, add a new phase that's compatible. ;; GNU options. Thus, add a new phase that's compatible.
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out")))
(samba (assoc-ref inputs "samba")))
(setenv "SHELL" (which "bash")) (setenv "SHELL" (which "bash"))
;; While we're at it, patch for tests. ;; While we're at it, patch for tests.
@ -74,9 +72,7 @@ (define-public qemu-headless
(string-append "--cc=" (which "gcc")) (string-append "--cc=" (which "gcc"))
"--disable-debug-info" ; save build space "--disable-debug-info" ; save build space
"--enable-virtfs" ; just to be sure "--enable-virtfs" ; just to be sure
(string-append "--prefix=" out) (string-append "--prefix=" out)))))
(string-append "--smbd=" samba
"/sbin/smbd")))))
(alist-cons-after (alist-cons-after
'install 'install-info 'install 'install-info
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -108,8 +104,7 @@ (define-public qemu-headless
;; ("pciutils" ,pciutils) ;; ("pciutils" ,pciutils)
("alsa-lib" ,alsa-lib) ("alsa-lib" ,alsa-lib)
("zlib" ,zlib) ("zlib" ,zlib)
("attr" ,attr) ("attr" ,attr)))
("samba" ,samba))) ; an optional dependency
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("python" ,python-2) ; incompatible with Python 3 according to error message ("python" ,python-2) ; incompatible with Python 3 according to error message
("texinfo" ,texinfo) ("texinfo" ,texinfo)