gnu: Add missing quotes in phase names passed to 'modify-phases'.
This is a followup to f8503e2.
* gnu/packages/gnome.scm (glib-networking): Add missing quotes before
  phase names passed to 'modify-phases'.
  (libsoup): Likewise.
  (gnome-terminal): Likewise.
  (colord): Likewise.
  (geoclue): Likewise.
* gnu/packages/gtk.scm (at-spi2-core, at-spi2-atk): Likewise.
* gnu/packages/haskell.scm (ghc-network): Likewise.
* gnu/packages/imagemagick.scm (perl-image-magick): Likewise.
* gnu/packages/video.scm (aalib): Likewise.
* gnu/packages/web.scm (nginx): Likewise.
			
			
This commit is contained in:
		
							parent
							
								
									caaf1933a4
								
							
						
					
					
						commit
						3a4de6b2d2
					
				
					 6 changed files with 17 additions and 17 deletions
				
			
		| 
						 | 
					@ -1654,7 +1654,7 @@ library.")
 | 
				
			||||||
       '("--with-ca-certificates=no")
 | 
					       '("--with-ca-certificates=no")
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before configure patch-giomoduledir
 | 
					         (add-before 'configure 'patch-giomoduledir
 | 
				
			||||||
                     ;; Install GIO modules into $out/lib/gio/modules.
 | 
					                     ;; Install GIO modules into $out/lib/gio/modules.
 | 
				
			||||||
                     (lambda _
 | 
					                     (lambda _
 | 
				
			||||||
                       (substitute* "configure"
 | 
					                       (substitute* "configure"
 | 
				
			||||||
| 
						 | 
					@ -1702,14 +1702,14 @@ library.")
 | 
				
			||||||
                            "/lib/gio/modules"))
 | 
					                            "/lib/gio/modules"))
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before configure disable-unconnected-socket-test
 | 
					         (add-before 'configure 'disable-unconnected-socket-test
 | 
				
			||||||
                     ;; This test fails due to missing /etc/nsswitch.conf
 | 
					                     ;; This test fails due to missing /etc/nsswitch.conf
 | 
				
			||||||
                     ;; in the build environment.
 | 
					                     ;; in the build environment.
 | 
				
			||||||
                     (lambda _
 | 
					                     (lambda _
 | 
				
			||||||
                       (substitute* "tests/socket-test.c"
 | 
					                       (substitute* "tests/socket-test.c"
 | 
				
			||||||
                         ((".*/sockets/unconnected.*") ""))
 | 
					                         ((".*/sockets/unconnected.*") ""))
 | 
				
			||||||
                       #t))
 | 
					                       #t))
 | 
				
			||||||
         (add-before check unset-LC_ALL
 | 
					         (add-before 'check 'unset-LC_ALL
 | 
				
			||||||
                     ;; The 'check-local' target runs 'env LANG=C sort -u',
 | 
					                     ;; The 'check-local' target runs 'env LANG=C sort -u',
 | 
				
			||||||
                     ;; unset 'LC_ALL' to make 'LANG' working.
 | 
					                     ;; unset 'LC_ALL' to make 'LANG' working.
 | 
				
			||||||
                     (lambda _
 | 
					                     (lambda _
 | 
				
			||||||
| 
						 | 
					@ -1852,7 +1852,7 @@ floating in an ocean using only your brain and a little bit of luck.")
 | 
				
			||||||
             "--without-nautilus-extension")
 | 
					             "--without-nautilus-extension")
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before configure patch-/bin/true
 | 
					         (add-before 'configure 'patch-/bin/true
 | 
				
			||||||
                     (lambda _
 | 
					                     (lambda _
 | 
				
			||||||
                       (substitute* "configure"
 | 
					                       (substitute* "configure"
 | 
				
			||||||
                         (("/bin/true") (which "true"))))))))
 | 
					                         (("/bin/true") (which "true"))))))))
 | 
				
			||||||
| 
						 | 
					@ -1913,14 +1913,14 @@ keyboard shortcuts.")
 | 
				
			||||||
                                              "/lib/udev/rules.d"))
 | 
					                                              "/lib/udev/rules.d"))
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before configure patch-/bin/true
 | 
					         (add-before 'configure 'patch-/bin/true
 | 
				
			||||||
                     (lambda _
 | 
					                     (lambda _
 | 
				
			||||||
                       (substitute* "configure"
 | 
					                       (substitute* "configure"
 | 
				
			||||||
                         (("/bin/true") (which "true")))
 | 
					                         (("/bin/true") (which "true")))
 | 
				
			||||||
                       (substitute* "src/Makefile.in"
 | 
					                       (substitute* "src/Makefile.in"
 | 
				
			||||||
                         (("if test -w \\$\\(DESTDIR\\)\\$\\(prefix\\)/;")
 | 
					                         (("if test -w \\$\\(DESTDIR\\)\\$\\(prefix\\)/;")
 | 
				
			||||||
                          "if test -w $(DESTDIR)$(localstatedir);"))))
 | 
					                          "if test -w $(DESTDIR)$(localstatedir);"))))
 | 
				
			||||||
         (add-before build set-cc
 | 
					         (add-before 'build 'set-cc
 | 
				
			||||||
                     (lambda _
 | 
					                     (lambda _
 | 
				
			||||||
                       ;; Set $CC so that g-ir-scanner works.
 | 
					                       ;; Set $CC so that g-ir-scanner works.
 | 
				
			||||||
                       (setenv "CC" "gcc")
 | 
					                       (setenv "CC" "gcc")
 | 
				
			||||||
| 
						 | 
					@ -1971,7 +1971,7 @@ output devices.")
 | 
				
			||||||
                               "--with-dbus-service-user=geoclue")
 | 
					                               "--with-dbus-service-user=geoclue")
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before configure patch-/bin/true
 | 
					         (add-before 'configure 'patch-/bin/true
 | 
				
			||||||
                     (lambda _
 | 
					                     (lambda _
 | 
				
			||||||
                       (substitute* "configure"
 | 
					                       (substitute* "configure"
 | 
				
			||||||
                         (("/bin/true") (which "true"))))))))
 | 
					                         (("/bin/true") (which "true"))))))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -359,7 +359,7 @@ in the GNOME project.")
 | 
				
			||||||
                           "/share/gtk-doc/html"))
 | 
					                           "/share/gtk-doc/html"))
 | 
				
			||||||
      #:phases
 | 
					      #:phases
 | 
				
			||||||
      (modify-phases %standard-phases
 | 
					      (modify-phases %standard-phases
 | 
				
			||||||
        (replace check
 | 
					        (replace 'check
 | 
				
			||||||
                 ;; Run test-suite under a dbus session.
 | 
					                 ;; Run test-suite under a dbus session.
 | 
				
			||||||
                 (lambda _
 | 
					                 (lambda _
 | 
				
			||||||
                   (zero? (system* "dbus-launch" "make" "check")))))))
 | 
					                   (zero? (system* "dbus-launch" "make" "check")))))))
 | 
				
			||||||
| 
						 | 
					@ -397,7 +397,7 @@ is part of the GNOME accessibility project.")
 | 
				
			||||||
   (arguments
 | 
					   (arguments
 | 
				
			||||||
    '(#:phases
 | 
					    '(#:phases
 | 
				
			||||||
      (modify-phases %standard-phases
 | 
					      (modify-phases %standard-phases
 | 
				
			||||||
        (replace check
 | 
					        (replace 'check
 | 
				
			||||||
                 ;; Run test-suite under a dbus session.
 | 
					                 ;; Run test-suite under a dbus session.
 | 
				
			||||||
                 (lambda _
 | 
					                 (lambda _
 | 
				
			||||||
                   (zero? (system* "dbus-launch" "make" "check")))))))
 | 
					                   (zero? (system* "dbus-launch" "make" "check")))))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -798,7 +798,7 @@ mutable and immutable), with a powerful loop optimisation framework.")
 | 
				
			||||||
     `(#:tests? #f  ; FIXME: currently missing libraries used for tests.
 | 
					     `(#:tests? #f  ; FIXME: currently missing libraries used for tests.
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before configure set-sh
 | 
					         (add-before 'configure 'set-sh
 | 
				
			||||||
                     (lambda _ (setenv "CONFIG_SHELL" "sh"))))))
 | 
					                     (lambda _ (setenv "CONFIG_SHELL" "sh"))))))
 | 
				
			||||||
    (home-page "https://github.com/haskell/network")
 | 
					    (home-page "https://github.com/haskell/network")
 | 
				
			||||||
    (synopsis "Low-level networking interface")
 | 
					    (synopsis "Low-level networking interface")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
;;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 | 
					;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 | 
				
			||||||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 | 
					;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
| 
						 | 
					@ -112,7 +112,7 @@ text, lines, polygons, ellipses and Bézier curves.")
 | 
				
			||||||
     `(#:phases
 | 
					     `(#:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before
 | 
					         (add-before
 | 
				
			||||||
          configure image-magick-flags
 | 
					          'configure 'image-magick-flags
 | 
				
			||||||
          (lambda* (#:key inputs #:allow-other-keys)
 | 
					          (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
            (let ((im (assoc-ref inputs "imagemagick")))
 | 
					            (let ((im (assoc-ref inputs "imagemagick")))
 | 
				
			||||||
              (substitute* "Makefile.PL"
 | 
					              (substitute* "Makefile.PL"
 | 
				
			||||||
| 
						 | 
					@ -121,7 +121,7 @@ text, lines, polygons, ellipses and Bézier curves.")
 | 
				
			||||||
                (("my \\$LIBS_magick = .*")
 | 
					                (("my \\$LIBS_magick = .*")
 | 
				
			||||||
                 "my $LIBS_magick = `pkg-config --libs ImageMagick`;\n")))))
 | 
					                 "my $LIBS_magick = `pkg-config --libs ImageMagick`;\n")))))
 | 
				
			||||||
         (add-before
 | 
					         (add-before
 | 
				
			||||||
          check skip-mpeg-tests
 | 
					          'check 'skip-mpeg-tests
 | 
				
			||||||
          (lambda _
 | 
					          (lambda _
 | 
				
			||||||
            ;; TODO: MPEG tests fail even though our imagemagick supports
 | 
					            ;; TODO: MPEG tests fail even though our imagemagick supports
 | 
				
			||||||
            ;; MPEG.  Has been reported elsewhere,
 | 
					            ;; MPEG.  Has been reported elsewhere,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -97,7 +97,7 @@
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     '(#:phases
 | 
					     '(#:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (replace configure
 | 
					         (replace 'configure
 | 
				
			||||||
                  (lambda* (#:key inputs outputs #:allow-other-keys)
 | 
					                  (lambda* (#:key inputs outputs #:allow-other-keys)
 | 
				
			||||||
                    ;; This old `configure' script doesn't support
 | 
					                    ;; This old `configure' script doesn't support
 | 
				
			||||||
                    ;; variables passed as arguments.
 | 
					                    ;; variables passed as arguments.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -109,11 +109,11 @@ and its related documentation.")
 | 
				
			||||||
     `(#:tests? #f                      ; no test target
 | 
					     `(#:tests? #f                      ; no test target
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (add-before configure patch-/bin/sh
 | 
					         (add-before 'configure 'patch-/bin/sh
 | 
				
			||||||
           (lambda _
 | 
					           (lambda _
 | 
				
			||||||
             (substitute* "auto/feature"
 | 
					             (substitute* "auto/feature"
 | 
				
			||||||
               (("/bin/sh") (which "bash")))))
 | 
					               (("/bin/sh") (which "bash")))))
 | 
				
			||||||
         (replace configure
 | 
					         (replace 'configure
 | 
				
			||||||
           (lambda* (#:key outputs #:allow-other-keys)
 | 
					           (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
             (let ((flags
 | 
					             (let ((flags
 | 
				
			||||||
                    (list (string-append "--prefix=" (assoc-ref outputs "out"))
 | 
					                    (list (string-append "--prefix=" (assoc-ref outputs "out"))
 | 
				
			||||||
| 
						 | 
					@ -138,7 +138,7 @@ and its related documentation.")
 | 
				
			||||||
               (format #t "environment variable `CC' set to `gcc'~%")
 | 
					               (format #t "environment variable `CC' set to `gcc'~%")
 | 
				
			||||||
               (format #t "configure flags: ~s~%" flags)
 | 
					               (format #t "configure flags: ~s~%" flags)
 | 
				
			||||||
               (zero? (apply system* "./configure" flags)))))
 | 
					               (zero? (apply system* "./configure" flags)))))
 | 
				
			||||||
         (add-after install fix-root-dirs
 | 
					         (add-after 'install 'fix-root-dirs
 | 
				
			||||||
           (lambda* (#:key outputs #:allow-other-keys)
 | 
					           (lambda* (#:key outputs #:allow-other-keys)
 | 
				
			||||||
             ;; 'make install' puts things in strange places, so we need to
 | 
					             ;; 'make install' puts things in strange places, so we need to
 | 
				
			||||||
             ;; clean it up ourselves.
 | 
					             ;; clean it up ourselves.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue