gnu: librsvg: Update to 2.40.6 and add 'pre-build phase.

* gnu/packages/gnome.scm (librsvg): Update to 2.40.6 and add 'pre-build phase.
This commit is contained in:
Federico Beffa 2015-01-18 19:24:31 +01:00
parent da6ce3f1b8
commit dc67ebd226

View File

@ -580,7 +580,7 @@ dealing with different structured file formats.")
(define-public librsvg (define-public librsvg
(package (package
(name "librsvg") (name "librsvg")
(version "2.40.2") (version "2.40.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -588,7 +588,7 @@ dealing with different structured file formats.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"071959yjb2i1bja7ciy4bmpnd6fn2is9jjqsvvvnsqwl69j9n128")))) "01jgb11779080b80k2ncrhdphgillqrrnszal6vh8yv787r4kwwa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -600,7 +600,7 @@ dealing with different structured file formats.")
;; gdk-pixbuf's prefix. Work around that. ;; gdk-pixbuf's prefix. Work around that.
(("gdk_pixbuf_moduledir = .*$") (("gdk_pixbuf_moduledir = .*$")
(string-append "gdk_pixbuf_moduledir = " (string-append "gdk_pixbuf_moduledir = "
"$(prefix)/lib/gdk-pixbuf-2.0/2.0.10/" "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
"loaders\n")) "loaders\n"))
;; Likewise, create a separate 'loaders.cache' file. ;; Likewise, create a separate 'loaders.cache' file.
(("gdk_pixbuf_cache_file = .*$") (("gdk_pixbuf_cache_file = .*$")
@ -610,7 +610,7 @@ dealing with different structured file formats.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((loaders-directory (let ((loaders-directory
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/lib/gdk-pixbuf-2.0/2.0.10/loaders"))) "/lib/gdk-pixbuf-2.0/2.10.0/loaders")))
(zero? (zero?
(system (system
(string-append (string-append
@ -619,7 +619,11 @@ dealing with different structured file formats.")
(string-join (find-files (assoc-ref inputs "gdk-pixbuf") (string-join (find-files (assoc-ref inputs "gdk-pixbuf")
"libpixbufloader-.*\\.so") " ") "libpixbufloader-.*\\.so") " ")
"> " loaders-directory ".cache"))))) "> " loaders-directory ".cache")))))
%standard-phases)))) (alist-cons-before
'build 'pre-build
(lambda* _
(setenv "CC" "gcc"))
%standard-phases)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; glib-mkenums, etc. ("glib" ,glib "bin") ; glib-mkenums, etc.