diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-02-28 12:18:45 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-02-28 12:18:45 +0200 |
| commit | f29f80c194d0c534a92354b2bc19022a9b70ecf8 (patch) | |
| tree | adc3c4114f59ef88ed3e097a8ec8517979f71562 /gnu/packages/gnome.scm | |
| parent | c034088e37b51018d5bfeb88d822c559b38d51db (diff) | |
| parent | 7947d47c9b891d2461ca9e7c53048d0e44294b5d (diff) | |
Merge branch 'rust-team'
Change-Id: Iee31c5de29c357c822f60df4fa8ce758779eb349
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 13 |
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") |