mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 21:59:08 -05:00
gnu: Fix incorrect references to %GNU-BUILD-SYSTEM-MODULES.
Fixes a regression introduced in 8ff3df5
.
* gnu/packages/emacs.scm (emacs-w3m)[arguments]: Use quasiquote, not
quote.
(emacs-wget)[arguments]: Likewise, and use unquote-splicing for
%GNU-BUILD-SYSTEM-MODULES.
(emms): Likewise.
* gnu/packages/haskell.scm (ghc): Likewise.
* gnu/packages/samba.scm (samba): Likewise.
This commit is contained in:
parent
b210b35d61
commit
caaf1933a4
3 changed files with 8 additions and 8 deletions
|
@ -306,7 +306,7 @@ (define-public emacs-w3m
|
||||||
("imagemagick" ,imagemagick)
|
("imagemagick" ,imagemagick)
|
||||||
("emacs" ,emacs-no-x)))
|
("emacs" ,emacs-no-x)))
|
||||||
(arguments
|
(arguments
|
||||||
'(#:modules ((guix build gnu-build-system)
|
`(#:modules ((guix build gnu-build-system)
|
||||||
(guix build utils)
|
(guix build utils)
|
||||||
(guix build emacs-utils))
|
(guix build emacs-utils))
|
||||||
#:imported-modules (,@%gnu-build-system-modules
|
#:imported-modules (,@%gnu-build-system-modules
|
||||||
|
@ -373,10 +373,10 @@ (define-public emacs-wget
|
||||||
(inputs `(("wget" ,wget)
|
(inputs `(("wget" ,wget)
|
||||||
("emacs" ,emacs-no-x)))
|
("emacs" ,emacs-no-x)))
|
||||||
(arguments
|
(arguments
|
||||||
'(#:modules ((guix build gnu-build-system)
|
`(#:modules ((guix build gnu-build-system)
|
||||||
(guix build utils)
|
(guix build utils)
|
||||||
(guix build emacs-utils))
|
(guix build emacs-utils))
|
||||||
#:imported-modules (,%gnu-build-system-modules
|
#:imported-modules (,@%gnu-build-system-modules
|
||||||
(guix build emacs-utils))
|
(guix build emacs-utils))
|
||||||
#:tests? #f ; no check target
|
#:tests? #f ; no check target
|
||||||
#:phases
|
#:phases
|
||||||
|
@ -440,10 +440,10 @@ (define-public emms
|
||||||
(string-append "all: " rest " emms-print-metadata\n"))))))
|
(string-append "all: " rest " emms-print-metadata\n"))))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:modules ((guix build gnu-build-system)
|
`(#:modules ((guix build gnu-build-system)
|
||||||
(guix build utils)
|
(guix build utils)
|
||||||
(guix build emacs-utils))
|
(guix build emacs-utils))
|
||||||
#:imported-modules (,%gnu-build-system-modules
|
#:imported-modules (,@%gnu-build-system-modules
|
||||||
(guix build emacs-utils))
|
(guix build emacs-utils))
|
||||||
|
|
||||||
#:phases (alist-replace
|
#:phases (alist-replace
|
||||||
|
|
|
@ -116,7 +116,7 @@ (define-public ghc
|
||||||
(guix build rpath)
|
(guix build rpath)
|
||||||
(srfi srfi-26)
|
(srfi srfi-26)
|
||||||
(srfi srfi-1))
|
(srfi srfi-1))
|
||||||
#:imported-modules (,%gnu-build-system-modules
|
#:imported-modules (,@%gnu-build-system-modules
|
||||||
(guix build rpath))
|
(guix build rpath))
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list
|
(list
|
||||||
|
|
|
@ -105,7 +105,7 @@ (define-public samba
|
||||||
"0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g"))))
|
"0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases (alist-cons-before
|
`(#:phases (alist-cons-before
|
||||||
'configure 'chdir
|
'configure 'chdir
|
||||||
(lambda _
|
(lambda _
|
||||||
(chdir "source3"))
|
(chdir "source3"))
|
||||||
|
@ -127,7 +127,7 @@ (define-public samba
|
||||||
(guix build utils)
|
(guix build utils)
|
||||||
(guix build rpath)
|
(guix build rpath)
|
||||||
(srfi srfi-26))
|
(srfi srfi-26))
|
||||||
#:imported-modules (,%gnu-build-system-modules
|
#:imported-modules (,@%gnu-build-system-modules
|
||||||
(guix build rpath))
|
(guix build rpath))
|
||||||
|
|
||||||
;; This flag is required to allow for "make test".
|
;; This flag is required to allow for "make test".
|
||||||
|
|
Loading…
Reference in a new issue