From unknown Fri Jun 20 07:14:42 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68039] [PATCH rust-team] gnu: librsvg: Improve cross compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 10:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68039@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by submit@debbugs.gnu.org id=B.170358723029460 (code B ref -1); Tue, 26 Dec 2023 10:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Dec 2023 10:40:30 +0000 Received: from localhost ([127.0.0.1]:55872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rI4rN-0007f5-DM for submit@debbugs.gnu.org; Tue, 26 Dec 2023 05:40:29 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rI4rL-0007et-Gi for submit@debbugs.gnu.org; Tue, 26 Dec 2023 05:40:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rI4r7-0006NT-UD for guix-patches@gnu.org; Tue, 26 Dec 2023 05:40:14 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rI4r5-00027j-4C for guix-patches@gnu.org; Tue, 26 Dec 2023 05:40:13 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-03 (Coremail) with SMTP id rQCowAA3eMB8rYplKifsAA--.37027S2; Tue, 26 Dec 2023 18:39:57 +0800 (CST) From: Zheng Junjie Date: Tue, 26 Dec 2023 18:38:48 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowAA3eMB8rYplKifsAA--.37027S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Cr 1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU7LZ2DUUUU X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/gnome.scm (librsvg): Improve cross compiling. [arguments]<#:phases>: Use platform-rust-target. Change-Id: I0fd24334286602642b2650fef52c79ea4955c3e8 --- gnu/packages/gnome.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b0417b2df9..339c85489f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Zhu Zihao +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -238,6 +239,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 +3595,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") base-commit: 2f9f39f44108884669e7201c8fbf7f7d39e65ff2 -- 2.41.0 From unknown Fri Jun 20 07:14:42 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Zheng Junjie Subject: bug#68039: closed (Re: [bug#68039] [PATCH rust-team] gnu: librsvg: Improve cross compiling.) Message-ID: References: X-Gnu-PR-Message: they-closed 68039 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 68039@debbugs.gnu.org Date: Tue, 26 Dec 2023 11:46:05 +0000 Content-Type: multipart/mixed; boundary="----------=_1703591165-21607-1" This is a multi-part message in MIME format... ------------=_1703591165-21607-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #68039: [PATCH rust-team] gnu: librsvg: Improve cross compiling. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 68039@debbugs.gnu.org. --=20 68039: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68039 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1703591165-21607-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 68039-done) by debbugs.gnu.org; 26 Dec 2023 11:45:50 +0000 Received: from localhost ([127.0.0.1]:56007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rI5sb-00057d-M6 for submit@debbugs.gnu.org; Tue, 26 Dec 2023 06:45:50 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:46257) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rI5sX-0004no-MV for 68039-done@debbugs.gnu.org; Tue, 26 Dec 2023 06:45:46 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40d2e5e8d1dso54328745e9.0 for <68039-done@debbugs.gnu.org>; Tue, 26 Dec 2023 03:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703591133; x=1704195933; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=LNI4uYXFeFbUMTjG3mEOG5bEmAByJVAQEyIeFZjZ+0Q=; b=Le89FxD8iYEitwPUsSGBARWiGc/MgpxtIRTIWNnhcja9PLdc74BXM357/nzoYAha9k vzg+WIp99fXgBsDQYylblfoRNOJ4X11exgnUJ3xz61xWPVauTAWGCMT4J14wyaewnYxx TAN4K1HwpLkwDgTlz1NstR2o5pCsfACp75SbtGCkI6XXoxNLfVbtPKFTBbs1K5rn9Ls1 IR6K+FCuj5AjmgV0AIICVPSk1cvT2Y3oyks5PUo9rU4eNC6c1UzDpDYRhHZQLLZi0Fpr QyTb2lQ5QV856zzZrfunuHEL+AEsMvvp0TkKcFgCbzK0o5sJdn0uDeUkHKhubuSyRGuU snjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703591133; x=1704195933; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LNI4uYXFeFbUMTjG3mEOG5bEmAByJVAQEyIeFZjZ+0Q=; b=gecIhcmbTfpIW3w0QNELtvMPbe1zyf/qKLYJ1n+2h0nGVewwtyjfjwj33fJ3ij1rmO QzdBqH3XMy0roZ73sUA1uvcjb9TTmMx/W69sK7pGsZFdS9FTgBQcj9PqboGrk5ytXVJS K/U0PfQirZMVfOm0uVjMgT4sGZuGPomVytubqj1k8n+lIpkET+HzITxvpZpQEmmGBCCR E5Yokhp7iYaM7pIi07k0QR0etUVXBeY6JJDOCRhX0pgjl/gmquwA02lx2cJ6ZmMKO06V lsDJmFaHSoPOYuwBsdZZo2f4qSWNKEdXaTCYUTZZd/4EF1GH11bUCtrIvEtZ/NTbbGFV GZVQ== X-Gm-Message-State: AOJu0YwfFCPp22wr+9oP2HI1VSmqIIrGjzi3+iIBvDT4qJgSiycxJERV 6wZMzPGQftoKjney7VRqHzs6rWyiWQhaL7fE X-Google-Smtp-Source: AGHT+IHZvAvPXsbOCz0KXuNyu7F8U0gZPx9QYp1oftqSHPNOctuEjPN/Npid21Ut/A1C1mbvpmiyfQ== X-Received: by 2002:a05:600c:c16:b0:40d:4dc7:13a1 with SMTP id fm22-20020a05600c0c1600b0040d4dc713a1mr1971188wmb.198.1703591132802; Tue, 26 Dec 2023 03:45:32 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id m20-20020a05600c3b1400b0040b4c59f133sm20387605wms.1.2023.12.26.03.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 03:45:32 -0800 (PST) Date: Tue, 26 Dec 2023 13:45:30 +0200 From: Efraim Flashner To: Zheng Junjie Subject: Re: [bug#68039] [PATCH rust-team] gnu: librsvg: Improve cross compiling. Message-ID: Mail-Followup-To: Efraim Flashner , Zheng Junjie , 68039-done@debbugs.gnu.org, Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LixIMN1U7spGycNh" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 68039-done Cc: Raghav Gururajan , Liliana Marie Prikler , Maxim Cournoyer , 68039-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --LixIMN1U7spGycNh Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks. I've applied it to the rust-team branch. gnome-team: Feel free to apply it to your branch too if you want. I didn't make any changes to the patch. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --LixIMN1U7spGycNh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmWKvNoACgkQQarn3Mo9 g1GaNA//dlCpteYlWnhaAn3LGpHRbYjwf2knlWGzu034RMhB/qvfkAMQvC8x0G93 jxcwnKB7mGWNgBAb8JYSv7E87w+omvvt+yI2EFZo204rkTYaKfXzPmcmeit+JKij zExX8HSNivFcrVeh3C7HKhl/uzkQfljKtaWNS3NvtIj18oIrR42qGtzJgW38FLmo SwmKuSmT4hxhMhMTi7uvpRigBt4e1xRC4USkXydQrCBwv/5ecReQ6mT0I0iEaA/M 0fUUvPWnx3DX8lKqXllqE5AfcghhZyvXGGEJPZiloMtdGSWntNY1Gio+7Bl4hBus coAeFw/o+P8mhKZfTlGDKAbsOBRazv8LWun732uY4H7aFxzJqzqm8+JWkJpa419J 7toqF18kFPB0TWxcMCzvhLI1eXilMNGrMiSb0DnoQdHq3sEND1+nX1EfL8lWmYqx Soxcz112JYbbJRrQQKp1Vf+ISywnS8Z7pL5Ft1qHimxn/JyoApyAC0Ynm270GTBH R5GugeVsrWLuTtFh/43NWyOwjOrSd9hG2WpLkC+AQ+loaFZX2ZpkG8RosdaWNiH6 X9VKjQPE1g15H11aDf+E5hav9OB7mk8iw7WB29SPoRwrI1pLdBLDahPOGQbhFe7H VhKHoMiGf5h36a5FJjuT4aYTyO+OurPdGduIVHCc3OZD73LRlZo= =unea -----END PGP SIGNATURE----- --LixIMN1U7spGycNh-- ------------=_1703591165-21607-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Dec 2023 10:40:30 +0000 Received: from localhost ([127.0.0.1]:55872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rI4rN-0007f5-DM for submit@debbugs.gnu.org; Tue, 26 Dec 2023 05:40:29 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rI4rL-0007et-Gi for submit@debbugs.gnu.org; Tue, 26 Dec 2023 05:40:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rI4r7-0006NT-UD for guix-patches@gnu.org; Tue, 26 Dec 2023 05:40:14 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rI4r5-00027j-4C for guix-patches@gnu.org; Tue, 26 Dec 2023 05:40:13 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-03 (Coremail) with SMTP id rQCowAA3eMB8rYplKifsAA--.37027S2; Tue, 26 Dec 2023 18:39:57 +0800 (CST) From: Zheng Junjie To: guix-patches@gnu.org Subject: [PATCH rust-team] gnu: librsvg: Improve cross compiling. Date: Tue, 26 Dec 2023 18:38:48 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowAA3eMB8rYplKifsAA--.37027S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Cr 1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU7LZ2DUUUU X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/gnome.scm (librsvg): Improve cross compiling. [arguments]<#:phases>: Use platform-rust-target. Change-Id: I0fd24334286602642b2650fef52c79ea4955c3e8 --- gnu/packages/gnome.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b0417b2df9..339c85489f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Zhu Zihao +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -238,6 +239,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 +3595,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") base-commit: 2f9f39f44108884669e7201c8fbf7f7d39e65ff2 -- 2.41.0 ------------=_1703591165-21607-1--