guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: librsvg: Use 'modify-phases' syntax.


From: Efraim Flashner
Subject: 02/02: gnu: librsvg: Use 'modify-phases' syntax.
Date: Fri, 10 Nov 2017 09:01:07 -0500 (EST)

efraim pushed a commit to branch core-updates
in repository guix.

commit b6239e452c5d7c697abfafe800b8722efd96644d
Author: Efraim Flashner <address@hidden>
Date:   Fri Nov 10 15:54:16 2017 +0200

    gnu: librsvg: Use 'modify-phases' syntax.
    
    * gnu/packages/gnome.scm (librsvg)[arguments]: Use 'modify-phases'
    syntax.
---
 gnu/packages/gnome.scm | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5a9d145..f4e8428 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1178,27 +1178,26 @@ dealing with different structured file formats.")
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-       (alist-cons-before
-        'configure 'pre-configure
-        (lambda* (#:key inputs #:allow-other-keys)
-          (substitute* "gdk-pixbuf-loader/Makefile.in"
-            ;; By default the gdk-pixbuf loader is installed under
-            ;; gdk-pixbuf's prefix.  Work around that.
-            (("gdk_pixbuf_moduledir = .*$")
-             (string-append "gdk_pixbuf_moduledir = "
-                            "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
-                             "loaders\n"))
-            ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
-            (("gdk_pixbuf_cache_file = .*$")
-             "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")))
-        (alist-cons-after
-         'unpack 'remove-failing-test
-         ;; This test fails on aarch64.
-         (lambda _
-           (delete-file 
"tests/fixtures/reftests/bugs/777834-empty-text-children.svg")
-           (delete-file 
"tests/fixtures/reftests/bugs/777834-empty-text-children-ref.png")
-           #t)
-        %standard-phases))))
+       (modify-phases %standard-phases
+         (add-before 'configure 'pre-configure
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "gdk-pixbuf-loader/Makefile.in"
+               ;; By default the gdk-pixbuf loader is installed under
+               ;; gdk-pixbuf's prefix.  Work around that.
+               (("gdk_pixbuf_moduledir = .*$")
+                (string-append "gdk_pixbuf_moduledir = "
+                               "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
+                                "loaders\n"))
+               ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
+               (("gdk_pixbuf_cache_file = .*$")
+                "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
+             #t))
+         (add-after 'unpack 'remove-failing-test
+           ;; This test fails on aarch64.
+           (lambda _
+             (delete-file 
"tests/fixtures/reftests/bugs/777834-empty-text-children.svg")
+             (delete-file 
"tests/fixtures/reftests/bugs/777834-empty-text-children-ref.png")
+             #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")                               ; glib-mkenums, etc.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]