diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 12:22:34 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 12:22:34 +0100 |
| commit | 25c14c893f05019d746321285acf55d1aa65b943 (patch) | |
| tree | 9c0a728b3c723fd171668713e0755a79a2034098 /gnu/packages/gnome.scm | |
| parent | 71a3dca25cd25f63c8fc17498a9a729e545f1890 (diff) | |
| parent | 4a0549be52f3f46fbce61342d8de30f7b83130c5 (diff) | |
Merge branch 'master' into gnome-team
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 d09eefe6552..13cad0add26 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -243,6 +243,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) @@ -3604,12 +3605,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") |