ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: librsvg: Drop 'loaders.cache' file.

Browse source 
This is a followup to 05c4b7e93.

* gnu/packages/gnome.scm (librsvg)[arguments]: Don't install 'loaders.cache' file.
* gnu/packages/gnome.scm (gnome-themes-standard),
  gnu/packages/key-mon.scm (keymon),
  gnu/packages/music.scm (solfege): Remove wrap phase for SVG support.
This commit is contained in:
宋文武 2016-04-28 12:13:26 +08:00
parent 0ddba70707
commit f3045a5ba3
3 changed files with 7 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/gnome.scm
View file

@ -880,7 +880,7 @@ (define-public librsvg
(arguments
`(#:phases
(alist-cons-before
'configure 'augment-gir-search-path
'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in"
;; By default the gdk-pixbuf loader is installed under
@ -889,24 +889,10 @@ (define-public librsvg
(string-append "gdk_pixbuf_moduledir = "
"$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
"loaders\n"))
;; Likewise, create a separate 'loaders.cache' file.
;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
(("gdk_pixbuf_cache_file = .*$")
"gdk_pixbuf_cache_file = $(gdk_pixbuf_moduledir).cache\n")))
(alist-cons-after
'install 'generate-full-cache
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((loaders-directory
(string-append (assoc-ref outputs "out")
"/lib/gdk-pixbuf-2.0/2.10.0/loaders")))
(zero?
(system
(string-append
"gdk-pixbuf-query-loaders "
loaders-directory "/libpixbufloader-svg.so "
(string-join (find-files (assoc-ref inputs "gdk-pixbuf")
"libpixbufloader-.*\\.so") " ")
"> " loaders-directory ".cache")))))
%standard-phases))))
"gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")))
%standard-phases)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; glib-mkenums, etc.
@ -1627,18 +1613,6 @@ (define-public gnome-themes-standard
`(("intltool" ,intltool)
("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
(arguments
`(#:phases
(alist-cons-before
'build 'use-full-cache
;; Use librsvg's loaders.cache instead of the one provided by
;; gdk-pixbuf because the latter does not include support for SVG
;; files.
(lambda* (#:key inputs #:allow-other-keys)
(setenv "GDK_PIXBUF_MODULE_FILE"
(car (find-files (assoc-ref inputs "librsvg")
"loaders\\.cache"))))
%standard-phases)))
(home-page "https://launchpad.net/gnome-themes-standard")
(synopsis "Default GNOME 3 themes")
(description

13
gnu/packages/key-mon.scm
View file

@ -41,25 +41,12 @@ (define-public key-mon
(build-system python-build-system)
(arguments
`(#:python ,python-2 ;uses the Python 2 'print' syntax
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(rsvg (assoc-ref inputs "librsvg"))
(pixbuf (find-files
rsvg "^loaders\\.cache$")))
;; Allow key-mon to load SVGs.
(wrap-program (string-append bin "/key-mon")
`("GDK_PIXBUF_MODULE_FILE" ":"
prefix ,pixbuf))))))
#:tests? #f)) ;no tests
(native-inputs
`(("python2-setuptools" ,python2-setuptools)))
(inputs
`(("python2-xlib" ,python2-xlib)
("python2-pygtk" ,python2-pygtk)
("librsvg" ,librsvg)
("python2-rsvg" ,python2-rsvg)))
(home-page "http://code.google.com/p/key-mon")
(synopsis "Show keyboard and mouse status")

12
gnu/packages/music.scm
View file

@ -548,15 +548,11 @@ (define-public solfege
(alist-cons-after
'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'solfege' runs with the correct PYTHONPATH. We
;; also need to modify GDK_PIXBUF_MODULE_FILE for SVG support.
;; Make sure 'solfege' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
(path (getenv "PYTHONPATH"))
(rsvg (assoc-ref inputs "librsvg"))
(pixbuf (find-files rsvg "^loaders\\.cache$")))
(path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/solfege")
`("PYTHONPATH" ":" prefix (,path))
`("GDK_PIXBUF_MODULE_FILE" ":" prefix ,pixbuf))))
`("PYTHONPATH" ":" prefix (,path)))))
%standard-phases)))))))
(inputs
`(("python" ,python-2)
@ -564,8 +560,6 @@ (define-public solfege
("gettext" ,gnu-gettext)
("gtk" ,gtk+)
("lilypond" ,lilypond)
("librsvg" ,librsvg) ; needed at runtime for icons
("libpng" ,libpng) ; needed at runtime for icons
;; players needed at runtime
("aplay" ,alsa-utils)
("csound" ,csound) ; optional, needed for some exercises