From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:36653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMwoJ-0002bb-9h for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMwoI-0004Xy-6m for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMwoI-0004Xq-1K for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iMwoH-0007V7-QX for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:01 -0400 Subject: [bug#37870] [PATCH] gnu: make-nsis: Fix cross-compilation. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:36605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMwo2-0002ZK-Ay for guix-patches@gnu.org; Tue, 22 Oct 2019 12:14:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMwo0-0004SQ-SG for guix-patches@gnu.org; Tue, 22 Oct 2019 12:14:45 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:42641) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMwo0-0004Rx-I7 for guix-patches@gnu.org; Tue, 22 Oct 2019 12:14:44 -0400 Date: Tue, 22 Oct 2019 16:14:33 +0000 From: Carl Dong Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 37870@debbugs.gnu.org Hi all, here's the somewhat hacky patch from #37801, I will follow up on #3= 0756 about using `-idirafter` as a potentially cleaner fix for #30756, but this should make nsis work for now! * gnu/packages/installers.scm (make-nsis)[arguments]: Enforce correct ordering of search paths (mingw-w64 last). --- gnu/packages/installers.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index c987254d61..e5e38af152 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -92,7 +92,21 @@ ;; CROSS_-prefixed version of env vars (setenv (string-append "CROSS_" env-name) (filter-delimited-string env-val ming= w-path?)))) - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_= PATH")))) + '("CPATH" "LIBRARY_PATH")) + ;; Hack to place mingw-w64 path at the end of sear= ch + ;; paths. Could probably use a specfile and diraf= ter + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-append + (string-join + (map (lambda (x) (string-append (assoc-r= ef %build-inputs "xgcc") x)) + `("/include/c++" + ,(string-append "/include/c++/" ,= triplet) + "/include/c++/backward" + "/lib/gcc/x86_64-w64-mingw32/7.4.= 0/include" + "/lib/gcc/x86_64-w64-mingw32/7.4.= 0/include-fixed")) + ":") + ":" + (getenv "CROSS_CPATH"))))) (add-before 'build 'fix-target-detection (lambda _ ;; NSIS target detection is screwed up, manually -- 2.23.0