me
/
guix
Archived
1
0
Fork 0
Code

gnu: freetype: Fix cross-compilation. 

Previously, the 'remove-reference-to-pkg-config' would break when
cross-compiling because the "/bin/pkg-config" file would not be found.

* gnu/packages/fontutils.scm (freetype)[arguments]: Add alternate
'remove-reference-to-pkg-config' phase for (%current-target-system) as
true.
master
Ludovic Courtès 2023-03-09 23:28:30 +01:00
parent af916f3f8b
commit 9aac443dc9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/fontutils.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018, 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@ -100,13 +100,23 @@
`(#:configure-flags (list "--enable-freetype-config")
#:disallowed-references (,pkg-config)
#:phases
(modify-phases %standard-phases
(add-after 'install 'remove-reference-to-pkg-config
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (string-append out "/bin/freetype-config")
(((search-input-file inputs "/bin/pkg-config"))
"pkg-config"))))))))
;; TODO: Keep only the first variant on the next core rebuild cycle.
,(if (%current-target-system)
'(modify-phases %standard-phases
(add-after 'install 'remove-reference-to-pkg-config
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (string-append out "/bin/freetype-config")
(("/([a-zA-Z0-9/\\._-]+)/bin/([a-zA-Z0-9_-]+)pkg-config"
_ store target)
"pkg-config"))))))
'(modify-phases %standard-phases
(add-after 'install 'remove-reference-to-pkg-config
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (string-append out "/bin/freetype-config")
(((search-input-file inputs "/bin/pkg-config"))
"pkg-config")))))))))
(native-inputs
(list pkg-config))
(propagated-inputs