From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id xvXuHuoRNmDKQwAA0tVLHw (envelope-from ) for ; Wed, 24 Feb 2021 08:44:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 9DdVGuoRNmBnSAAA1q6Kng (envelope-from ) for ; Wed, 24 Feb 2021 08:44:26 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0E41E20341 for ; Wed, 24 Feb 2021 09:44:26 +0100 (CET) Received: from localhost ([::1]:52434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEpmS-0005UH-Qb for larch@yhetil.org; Wed, 24 Feb 2021 03:44:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEpm6-0005UA-Pt for guix-patches@gnu.org; Wed, 24 Feb 2021 03:44:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEpm6-0005BB-Hz for guix-patches@gnu.org; Wed, 24 Feb 2021 03:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEpm6-0000kd-Ev for guix-patches@gnu.org; Wed, 24 Feb 2021 03:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46740] [PATCH] gnu: make-nsis: Fix build Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Feb 2021 08:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46740 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Carl Dong Cc: 46740@debbugs.gnu.org Received: via spool by 46740-submit@debbugs.gnu.org id=B46740.16141561982817 (code B ref 46740); Wed, 24 Feb 2021 08:44:02 +0000 Received: (at 46740) by debbugs.gnu.org; 24 Feb 2021 08:43:18 +0000 Received: from localhost ([127.0.0.1]:33261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEplO-0000jN-5H for submit@debbugs.gnu.org; Wed, 24 Feb 2021 03:43:18 -0500 Received: from mira.cbaines.net ([212.71.252.8]:37776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEplM-0000jF-HF for 46740@debbugs.gnu.org; Wed, 24 Feb 2021 03:43:17 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id D190F27BC4A; Wed, 24 Feb 2021 08:43:15 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ade2f984; Wed, 24 Feb 2021 08:43:15 +0000 (UTC) References: <20210224030050.457744-1-contact@carldong.me> User-agent: mu4e 1.4.14; emacs 27.1 From: Christopher Baines In-reply-to: <20210224030050.457744-1-contact@carldong.me> Date: Wed, 24 Feb 2021 08:43:15 +0000 Message-ID: <87ft1lluu4.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.47 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 0E41E20341 X-Spam-Score: -4.47 X-Migadu-Scanner: scn1.migadu.com X-TUID: 2SeQ6amk5pej --=-=-= Content-Type: text/plain Carl Dong writes: > * gnu/packages/installers.scm (make-nsis)[arguments]: Use > C{,PLUS}_INCLUDE_PATH instead of CPATH environment variable to fix > build. > --- > gnu/packages/installers.scm | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm > index a8a5c36a18..e8196b27d0 100644 > --- a/gnu/packages/installers.scm > +++ b/gnu/packages/installers.scm > @@ -96,9 +96,18 @@ > ;; CROSS_-prefixed version of env vars > (setenv (string-append "CROSS_" env-name) > (filter-delimited-string env-val mingw-path?)))) > - '("CPATH" "LIBRARY_PATH")) > + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH")) > ;; Hack to place mingw-w64 path at the end of search > ;; paths. Could probably use a specfile and dirafter > + (setenv "CROSS_C_INCLUDE_PATH" > + (string-join > + `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") > + "/lib/gcc/" ,triplet "/" > + ,(package-version xgcc) <>) > + '("/include" > + "/include-fixed")) > + ,(getenv "CROSS_C_INCLUDE_PATH")) > + ":")) > (setenv "CROSS_CPLUS_INCLUDE_PATH" > (string-join > `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") <>) > @@ -108,7 +117,7 @@ > ,@(map (cut string-append "/lib/gcc/" ,triplet "/" ,(package-version xgcc) <>) > '("/include" > "/include-fixed")))) > - ,(getenv "CROSS_CPATH")) > + ,(getenv "CROSS_CPLUS_INCLUDE_PATH")) > ":")))) > (add-before 'build 'fix-target-detection > (lambda _ Hey! Looks like this does fix things which is great [1], but it also introduces some lint warnings [2]. 1: https://data.guix-patches.cbaines.net/compare/package-derivations?base_commit=c418c6b64cbfa7a4eb1bfb7d02a99083103dd40e&target_commit=28d1e194346b3dae2ae4e969c00724d4d1037ff4&locale=en_US.UTF-8 2: https://data.guix-patches.cbaines.net/compare?base_commit=c418c6b64cbfa7a4eb1bfb7d02a99083103dd40e&target_commit=28d1e194346b3dae2ae4e969c00724d4d1037ff4 So, I'd remove the tabs and tweak the indentation so you're not introducing any new long lines. But apart from that I think it's fine to push, you can push right? Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmA2EaNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcHiA//YVKL2y/0ffgF5yf8bQ8NW2HzDlKpysFa L7dMejmc2mzrnW6eovQIeDmbBsx6EwzKjmaqsQE4QLuT+iOnr4/EFV2/ggnn3mTn m//W9fcYrJTuxrYSu+HzbAckEZmdiRxpDABKZHrGANnuimwNk1lSnki1VRtS8CDn aLal1vilyBYT22thYNQDbWUo4IKWQhQ2wqRmEX/iFlWq4d5jH5yYpHsSXIvhviJX CS12wNd5hHtGlnq5qYvYbfI34jptwFs/evcob5ZUSpbMJbktF5n1hBFMhL+wajpL ad4E/sj1I4IVULe4SHHhoCA0/JitJCKJtERSkVcKy45cKiAL5E5jYLq5Z/OdYA1P rFGH3aQe/oAW1J0+yF61pXSdJ05q7AFpEfEEAOoXPpduY+7j6zBWuKh4Veg63NXd SGe4u5/iSfF5EnWhW9FXUlWBJz3wuBM+P+//jaCYhuHl+DgTxLx9neiu8rO1XT84 5WgzPYNAKq9IfnSGe//5yzuaAu0Dddg4aWYThVhRkVs4SE2B13KsKQX0pyRl6pPl pqJZb9Rr5wS8NIKkUiLh3VRJYbtbyhd5Hg4PzIDnvkOWBA2wSiLyLF9fLCtn6Dn1 hwW60+qTHAYtC5p3G0jOF0rPCx54LCxJjkn2Jn7XAC+AFTxLfTkxUHGQhnmR0Gqe GPOz+z7Mz2c= =SNGX -----END PGP SIGNATURE----- --=-=-=--