summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZheng Junjie <873216071@qq.com>2023-12-26 13:17:15 +0200
committerEfraim Flashner <efraim@flashner.co.il>2024-02-20 13:56:48 +0200
commitc2010b2f0b2dd58f45fbe4673ae10daa87f05be1 (patch)
tree705b2530c6217a3241e3448a2a6f8b34e429fcec
parenta447a2f5b44052f84c9f37e192bf46c07920068d (diff)
gnu: librsvg: Improve cross compiling.
* gnu/packages/gnome.scm (librsvg)[arguments]: Use platform-rust-target. Change-Id: Ia81e13a8695f7b932255e5223b92d31fb0a88077 Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
-rw-r--r--gnu/packages/gnome.scm13
1 files 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 @@
#: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 @@ for dealing with different structured file formats.")
;; 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")