me/guix
Archived
1
0
Fork 0
Code Activity

build/minetest-build-system: Move png-file? to (guix build utils).

Browse source 
It's not really Minetest-specific.  It was only placed in
(guix build minetest-build-system) to avoid a world rebuild.

* guix/build/minetest-build-system.scm (%png-magic-bytes,png-file?):
  Move to ...
* guix/build/utils.scm (%png-magic-bytes,png-file?): ... here.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Maxime Devos 2021-10-01 16:21:07 +02:00 • committed by Mathieu Othacehe
parent 9bf0652b08
commit 8a55fde935
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/build/minetest-build-system.scm
View file

@ -90,15 +90,6 @@ If it is unknown, make an educated guess."
#:install-plan (mod-install-plan (apply guess-mod-name arguments)) #:install-plan (mod-install-plan (apply guess-mod-name arguments))
arguments)) arguments))
(define %png-magic-bytes
;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in
;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’
;; on <https://www.w3.org/TR/PNG/>.
#vu8(137 80 78 71 13 10 26 10))
(define png-file?
((@@ (guix build utils) file-header-match) %png-magic-bytes))
(define* (minimise-png #:key inputs native-inputs #:allow-other-keys) (define* (minimise-png #:key inputs native-inputs #:allow-other-keys)
"Minimise PNG images found in the working directory." "Minimise PNG images found in the working directory."
(define optipng (which "optipng")) (define optipng (which "optipng"))

11
guix/build/utils.scm
View file

@ -61,6 +61,8 @@
symbolic-link? symbolic-link?
call-with-temporary-output-file call-with-temporary-output-file
call-with-ascii-input-file call-with-ascii-input-file
file-header-match
png-file?
elf-file? elf-file?
ar-file? ar-file?
gzip-file? gzip-file?
@ -290,6 +292,15 @@ with the bytes in HEADER, a bytevector."
#f ;FILE is a directory #f ;FILE is a directory
(apply throw args)))))) (apply throw args))))))
(define %png-magic-bytes
;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in
;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’
;; on <https://www.w3.org/TR/PNG/>.
#vu8(137 80 78 71 13 10 26 10))
(define png-file?
(file-header-match %png-magic-bytes))
(define %elf-magic-bytes (define %elf-magic-bytes
;; Magic bytes of ELF files. See <elf.h>. ;; Magic bytes of ELF files. See <elf.h>.
(u8-list->bytevector (map char->integer (string->list "\x7FELF")))) (u8-list->bytevector (map char->integer (string->list "\x7FELF"))))