From c2010b2f0b2dd58f45fbe4673ae10daa87f05be1 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Tue, 26 Dec 2023 13:17:15 +0200 Subject: [PATCH] gnu: librsvg: Improve cross compiling. * gnu/packages/gnome.scm (librsvg)[arguments]: Use platform-rust-target. Change-Id: Ia81e13a8695f7b932255e5223b92d31fb0a88077 Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 953bd817ed..d14651c792 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -238,6 +238,7 @@ (define-module (gnu packages gnome) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix platform) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (ice-9 match) @@ -3593,12 +3594,12 @@ (define-public librsvg ;; In lieu of #:make-flags (setenv "CC" #$(cc-for-target)) (setenv "PKG_CONFIG" #$(pkg-config-for-target)) - (when #$(%current-target-system) - (setenv "RUST_TARGET" - (string-replace - #$(%current-target-system) - "-unknown-linux-gnu" - (string-index #$(%current-target-system) #\-)))) + #$@(if (%current-target-system) + #~((setenv "RUST_TARGET" + #$(platform-rust-target + (lookup-platform-by-target + (%current-target-system))))) + #~()) ;; Something about the build environment resists building ;; successfully with the '--locked' flag. (substitute* '("Makefile.am" "Makefile.in")