From caaf1933a453e7f3f8d7444f2c97dac3f8a93e1c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 10 Apr 2015 10:34:04 +0200
Subject: 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.
---
 gnu/packages/emacs.scm   | 10 +++++-----
 gnu/packages/haskell.scm |  2 +-
 gnu/packages/samba.scm   |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3b9b7cf3f8..73246ab3b9 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -306,7 +306,7 @@ (define-public emacs-w3m
               ("imagemagick" ,imagemagick)
               ("emacs" ,emacs-no-x)))
     (arguments
-     '(#:modules ((guix build gnu-build-system)
+     `(#:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (guix build emacs-utils))
        #:imported-modules (,@%gnu-build-system-modules
@@ -373,10 +373,10 @@ (define-public emacs-wget
     (inputs `(("wget" ,wget)
               ("emacs" ,emacs-no-x)))
     (arguments
-     '(#:modules ((guix build gnu-build-system)
+     `(#:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (guix build emacs-utils))
-       #:imported-modules (,%gnu-build-system-modules
+       #:imported-modules (,@%gnu-build-system-modules
                            (guix build emacs-utils))
        #:tests? #f  ; no check target
        #:phases
@@ -440,10 +440,10 @@ (define-public emms
                    (string-append "all: " rest " emms-print-metadata\n"))))))
     (build-system gnu-build-system)
     (arguments
-     '(#:modules ((guix build gnu-build-system)
+     `(#:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (guix build emacs-utils))
-       #:imported-modules (,%gnu-build-system-modules
+       #:imported-modules (,@%gnu-build-system-modules
                            (guix build emacs-utils))
 
        #:phases (alist-replace
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index e6b8e07be7..f5f5020197 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -116,7 +116,7 @@ (define-public ghc
                   (guix build rpath)
                   (srfi srfi-26)
                   (srfi srfi-1))
-       #:imported-modules (,%gnu-build-system-modules
+       #:imported-modules (,@%gnu-build-system-modules
                            (guix build rpath))
        #:configure-flags
        (list
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index d26d2d7789..8e53debcb3 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -105,7 +105,7 @@ (define-public samba
                "0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases (alist-cons-before
+     `(#:phases (alist-cons-before
                  'configure 'chdir
                  (lambda _
                    (chdir "source3"))
@@ -127,7 +127,7 @@ (define-public samba
                   (guix build utils)
                   (guix build rpath)
                   (srfi srfi-26))
-       #:imported-modules (,%gnu-build-system-modules
+       #:imported-modules (,@%gnu-build-system-modules
                            (guix build rpath))
 
        ;; This flag is required to allow for "make test".
-- 
cgit v1.2.3