~ruther/guix-local: gnu: freetype: Pass valid #:disallowed-references when cross-compiling.

eb6b1aed25a61af5bc489bc5d0b69750f5abdff3 — Ludovic Courtès 5 months ago c4fdfa3

gnu: freetype: Pass valid #:disallowed-references when cross-compiling.

Fixes a regression introduced in ad461613d97f974e9e1aa30dc27753aa360476de
whereby ‘this-package-native-input’ would return #f when cross-compiling.

* gnu/packages/fontutils.scm (freetype)[arguments]: Adjust name passed to
‘this-package-native-input’ based on (%current-target-system).

Change-Id: I5487c9ef9cf760148aefbaa8c11f4bf417482bec

patch browse .tar.gz

1 files changed, 5 insertions(+), 1 deletions(-)

M gnu/packages/fontutils.scm

M gnu/packages/fontutils.scm => gnu/packages/fontutils.scm +5 -1

@@ 123,7 123,11 @@
                                 #$@(if (target-arm32?)
                                        (list "CFLAGS=-g -O2 -fno-tree-slp-vectorize")
                                        '()))
-      #:disallowed-references (list (this-package-native-input "pkg-config"))
+      #:disallowed-references (list (this-package-native-input
+                                     (if (%current-target-system)
+                                         (string-append "pkg-config-"
+                                                        (%current-target-system))
+                                         "pkg-config")))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'install 'remove-reference-to-pkg-config