From unknown Wed Jun 18 23:16:12 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#46740 <46740@debbugs.gnu.org> To: bug#46740 <46740@debbugs.gnu.org> Subject: Status: [PATCH] gnu: make-nsis: Fix build Reply-To: bug#46740 <46740@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:16:12 +0000 retitle 46740 [PATCH] gnu: make-nsis: Fix build reassign 46740 guix-patches submitter 46740 Carl Dong severity 46740 normal tag 46740 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 23 22:01:04 2021 Received: (at submit) by debbugs.gnu.org; 24 Feb 2021 03:01:04 +0000 Received: from localhost ([127.0.0.1]:32974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEkQB-0000mM-QS for submit@debbugs.gnu.org; Tue, 23 Feb 2021 22:01:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:51870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEkQA-0000mC-Ih for submit@debbugs.gnu.org; Tue, 23 Feb 2021 22:01:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEkQ8-00029v-PQ for guix-patches@gnu.org; Tue, 23 Feb 2021 22:01:02 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:46363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEkQ4-0002uu-H5 for guix-patches@gnu.org; Tue, 23 Feb 2021 22:01:00 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id B3FFCD05; Tue, 23 Feb 2021 22:00:52 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 23 Feb 2021 22:00:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=Dr9I1213CMoO7+C3v1B48ay+5k PVZ4iOh5ye8QUGW68=; b=uMK/9Bg0y6Xy1bz9MDuca650yWy7FdU1rleoEQT7Um D+wOYbaXI8Ku4OEisu4St3RhpqOTWqLslThZpN2SCKOvoSfNdxePgUeatb4Gj+hx h85EL34z7FFMWHIA3LFfFb/gu9rsGXB1pHieHaIwibDU3cMtupEi5ipcoOTh70jh TKYlyegHn6WZ/PSSt3wOA1H5Z20nCMzHqAtvjm6H722UQaEgHW6gxDioZEEGx0f1 fia8bY+LWI0eDH3HPxodlf2PjhtC9y9ko1MoB8fBbqsAYWYUeSEWgL5ak1cRDMAj 7QjTlXIV72jFDQuZxw0NOHVJC5hGkPPjlCI2bHXj8DOQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=Dr9I1213CMoO7+C3v 1B48ay+5kPVZ4iOh5ye8QUGW68=; b=iVBpUVY6fEgRj1j09Bm06P20iV3U0DYWg m4MdlWSkyJI/YQh0oMWpwTeHW1hRWFgfoaLQf9HXkElzjvLoM95B6eqCvq64FGnq YQ63KLJNyht+2Jo5UzEzo8CBswvjLUsOl7IL8c9K/8xu18YJp5Iv8CwIQzaY8CBv pdumJH4m/GAXD6uUfCPjSPxmhNCVfEV/62fATblU2uTigIXPkihuIrSTe9iR3gg3 UYMQV9Vgzr1Dkl1VzqOaEm17EQeM8k1EFfDb7IhuNbtiAJR7ZNUZbRnxQLEI+cUm ERIn/ck9WPpUoSXSy/LrSq1Z5+aeSg41Q1L6aWtbP4vXP9zVIY4EQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrkeeigdehtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpeevrghrlhcuffhonhhguceotghonhhtrggtthestggrrhhlughonhhg rdhmvgeqnecuggftrfgrthhtvghrnhepleeuueelleeikefftdeuieefvefhjeffhfffje ehveelheffffeiieegteejveeknecukfhppeegrdehfedrledvrdduudegnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghonhhtrggtthestg grrhhlughonhhgrdhmvg X-ME-Proxy: Received: from dai.int.chaincode.com (unknown [4.53.92.114]) by mail.messagingengine.com (Postfix) with ESMTPA id E6F081080054; Tue, 23 Feb 2021 22:00:51 -0500 (EST) From: Carl Dong To: guix-patches@gnu.org Subject: [PATCH] gnu: make-nsis: Fix build Date: Tue, 23 Feb 2021 22:00:50 -0500 Message-Id: <20210224030050.457744-1-contact@carldong.me> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.19; envelope-from=contact@carldong.me; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: Carl Dong 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: -2.6 (--) * 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 _ -- 2.30.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 24 03:43:18 2021 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 To: Carl Dong Subject: Re: [bug#46740] [PATCH] gnu: make-nsis: Fix build 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 46740 Cc: 46740@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: -1.0 (-) --=-=-= 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----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 24 15:42:11 2021 Received: (at 46740) by debbugs.gnu.org; 24 Feb 2021 20:42:11 +0000 Received: from localhost ([127.0.0.1]:36054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lF0z4-0006Zq-VK for submit@debbugs.gnu.org; Wed, 24 Feb 2021 15:42:11 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:37587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lF0z2-0006Zc-LN for 46740@debbugs.gnu.org; Wed, 24 Feb 2021 15:42:09 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 881BB5C008D; Wed, 24 Feb 2021 15:42:03 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 24 Feb 2021 15:42:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:message-id:content-type:mime-version:subject:date :in-reply-to:cc:to:references; s=fm3; bh=D7uIUd//CCTo6ZRW9/exnrV 4AqzQE3kB9pwQ9rQZFXE=; b=Vvjmhtb2VzJJG8f64gY4t1OYIuHhSdMQCj9wCtD rV+5GKmEEv25HlXYZbkmQagdx3PUEXPruwOOo9Wc+Si5cie/nzyHs8SkNeurf8v9 G0mnA+c1u2E/Y3N9g4x+hnKlEXGooai5yphqm2b3EBLiIMoUP2fZDmhLfDRW6lf+ tPX2R87ZHHpQcf7Ct0eVhJEyyFLJvzvfSSKfjYYo9ndmvp5j6MBk7mrokUafLVfx 9Ou8OZzTkwfRU2P1eD66omYYC0iXI9y7SKgx6gzXy/H1/2JWVGhHil4bE9nHCpQT rIvcBB8BcMY6PZBvrippbjzkM+SNe6hDfeFd4scDCGyk+ww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=D7uIUd //CCTo6ZRW9/exnrV4AqzQE3kB9pwQ9rQZFXE=; b=Jil/LHmJ3LueKI8fpD8LUE V7CZYFBigY4JO8ATCpjURc86JlwZfLHlDaWUWC84cH2yQXtDaK+BG+eWtM1yCnV1 pP3O0oM3rzbwfTa5kCe3AmFFyEU+Z/o5/IoDu0sSM4lgs8rXbGQzn2xuHepJGJEK 9BDcB8T/AtiiIRe62Rm95V1OKiPeIHx0kqxJtSYHCpiQHBzv1t+sT5RKTfrgBaTG +GBoFBTzP7SRmYtS1Of7ItpAZK2wL7GEjXMyBVU0FtmY3Kw5d7x5SyaQhHeAoO/+ qk2ox2A6cnRAHmlOkNmLBJ5hfXwbfAxQ8Di4huYP7/7h5l1Rk8PKYODagKvFPsIg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrkeejgddufeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhkfgtggfuffgjvfhfofesghdtmh erhhdtvdenucfhrhhomhepvegrrhhlucffohhnghcuoegtohhnthgrtghtsegtrghrlhgu ohhnghdrmhgvqeenucggtffrrghtthgvrhhnpeefleehkeeuieevvdelfedtvdeihfejke duvdfhhfekieevuefhueehieektdfggeenucffohhmrghinhepshhouhhrtggvfhhorhhg vgdrnhgvthdptggsrghinhgvshdrnhgvthenucfkphepleeirddvfeelrddujedrvdegvd enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohhn thgrtghtsegtrghrlhguohhnghdrmhgv X-ME-Proxy: Received: from [192.168.0.6] (pool-96-239-17-242.nycmny.fios.verizon.net [96.239.17.242]) by mail.messagingengine.com (Postfix) with ESMTPA id E137B24005B; Wed, 24 Feb 2021 15:42:02 -0500 (EST) From: Carl Dong Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_89DEF8B2-745A-46FC-8664-D4F3EACAC20C"; protocol="application/pgp-signature"; micalg=pgp-sha256 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: [bug#46740] [PATCH] gnu: make-nsis: Fix build Date: Wed, 24 Feb 2021 15:42:01 -0500 In-Reply-To: <87ft1lluu4.fsf@cbaines.net> To: Christopher Baines References: <20210224030050.457744-1-contact@carldong.me> <87ft1lluu4.fsf@cbaines.net> X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46740 Cc: 46740@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: -1.7 (-) --Apple-Mail=_89DEF8B2-745A-46FC-8664-D4F3EACAC20C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Hi Chris! Been a while since I last submitted a patch, so want to make sure I get = this right :-) Thanks for your help! Does this look alright? =46rom 6b4460bdb64db6f7f9f33c80710bc7020b8fd1f0 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Wed, 3 Feb 2021 20:21:31 +0000 Subject: [PATCH] gnu: make-nsis: Fix build * gnu/packages/installers.scm (make-nsis)[arguments]: Use C{,PLUS}_INCLUDE_PATH instead of CPATH environment variable to fix build. --- gnu/packages/installers.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index a8a5c36a18..775b91f0f7 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -92,13 +92,23 @@ ;; for native toolchain (setenv env-name (filter-delimited-string env-val = (negate mingw-path?))) - ;; Add the removed paths back into - ;; CROSS_-prefixed version of env vars + ;; Add the removed paths back into = 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,21 +118,20 @@ ,@(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 _ - ;; NSIS target detection is screwed up, = manually - ;; change it ourselves + ;; NSIS target detection is screwed up, = manually change + ;; it ourselves (substitute* "Source/build.cpp" = (("m_target_type=3DTARGET_X86ANSI") (string-append = "m_target_type=3D" ,nsis-target-type)))))))) (home-page "http://nsis.sourceforge.net/") (synopsis "A professional open source system to create Windows = installers") (description - "NSIS (Nullsoft Scriptable Install System) is a professional = open -source system to create Windows installers. It is designed to be as = small and -flexible as possible and is therefore very suitable for internet -distribution.") + "NSIS (Nullsoft Scriptable Install System) is a professional = open source +system to create Windows installers. It is designed to be as small and = flexible +as possible and is therefore very suitable for internet distribution.") (license (license:non-copyleft "file://COPYING" "See COPYING in the = distribution."))))) -- 2.30.1 Cheers, Carl Dong contact@carldong.me "I fight for the users" > On Feb 24, 2021, at 3:43 AM, Christopher Baines = wrote: >=20 >=20 > Carl Dong writes: >=20 >> * 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(-) >>=20 >> 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 _ >=20 > Hey! >=20 > Looks like this does fix things which is great [1], but it also > introduces some lint warnings [2]. >=20 > 1: = https://data.guix-patches.cbaines.net/compare/package-derivations?base_com= mit=3Dc418c6b64cbfa7a4eb1bfb7d02a99083103dd40e&target_commit=3D28d1e194346= b3dae2ae4e969c00724d4d1037ff4&locale=3Den_US.UTF-8 > 2: = https://data.guix-patches.cbaines.net/compare?base_commit=3Dc418c6b64cbfa7= a4eb1bfb7d02a99083103dd40e&target_commit=3D28d1e194346b3dae2ae4e969c00724d= 4d1037ff4 >=20 > 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? >=20 > Chris --Apple-Mail=_89DEF8B2-745A-46FC-8664-D4F3EACAC20C Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEECc3SW1JEo3Z49u6oDMUhUxl5kaUFAmA2uhkACgkQDMUhUxl5 kaVtlQ//ez5nBmQjQDswN1EbwxisotCy244Jy8B/f4YGtjUh6wWS9wVjLHgpCY82 JHD01aFtzydYKlnsSkKfhJWK7sAH949ln0ApNPE3SX7YY2QVDLx6EJmcE3/ga/Mi Rp5DnoxFYBWe1NcFFyHY8m774IB4oOSC5tgqGobce7HlQ8pdtap/4NXn5D1RqW16 JU9FB9g7KHEvHsrKdbFAt/Wyimo4Y1Vp6oPO56jAsTkkl3CU4bn69yyDfAI1kYjm x02r8jA/m2Ht0oSQfAabdcQLwqUnng4JQmTvKlUnS/QFZHJrDMZQmcaoyY8MZ0YS 67iRPTLu3eQ5z9DVaZAeKtTosDTZEnzdCfRiumFS+6z4hvX/2MXmlpSeDwlUqGE/ jg7gNyDQOg4uxSqVGZJked+ZnV5JrPtNMpgMefiHhYiBtdaGt2tRfL2rW1gpzMdS daciMSFq9csZxuVtCmxE1OGSrsPtqrmHmndEldfokLqeePLwhzeCtz5cfTUTUDpj lNIDV6xU5sGsY52Y2Lwplg2fy6uVvk5A/toDPttrxXi9VBTaZyvfY2bcQN1lmu9D 0XscfgQK4CNGB+Cs/ucHzcsuVItHKAR03WNTkE8tAdr/pLjT+Kepeej3yWeGHLet RZBPX+0bm10dViLsXCNv9VO11y9SIJ1fUkld3+F7YPSbBCVoxso= =ELwW -----END PGP SIGNATURE----- --Apple-Mail=_89DEF8B2-745A-46FC-8664-D4F3EACAC20C-- From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 25 03:59:28 2021 Received: (at 46740) by debbugs.gnu.org; 25 Feb 2021 08:59:28 +0000 Received: from localhost ([127.0.0.1]:36608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFCUa-0000ru-IP for submit@debbugs.gnu.org; Thu, 25 Feb 2021 03:59:28 -0500 Received: from mira.cbaines.net ([212.71.252.8]:45544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFCUY-0000rl-7e for 46740@debbugs.gnu.org; Thu, 25 Feb 2021 03:59:26 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id DBF2C27BC4A; Thu, 25 Feb 2021 08:59:24 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 752a8389; Thu, 25 Feb 2021 08:59:23 +0000 (UTC) References: <20210224030050.457744-1-contact@carldong.me> <87ft1lluu4.fsf@cbaines.net> User-agent: mu4e 1.4.14; emacs 27.1 From: Christopher Baines To: Carl Dong Subject: Re: [bug#46740] [PATCH] gnu: make-nsis: Fix build In-reply-to: Date: Thu, 25 Feb 2021 08:59:23 +0000 Message-ID: <87v9agjzf8.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 46740 Cc: 46740@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: -1.0 (-) --=-=-= Content-Type: text/plain Carl Dong writes: > Been a while since I last submitted a patch, so want to make sure I > get this right :-) Thanks for your help! > > Does this look alright? Yep, that looks fine. There's a couple of changes that look a bit redundant, the rearranging of a comment and the description string, but that's not a problem. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmA3ZutfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdJQA//cIPuoL3FcFtxCTU+NDwtG1WaiqtErLfg LnCvsQ1yq+OsXPuQrGEx6XetbzJhse9ZPhfG0iVfM3QUcljNVKxu3Vh+7qbiudBn QKucb4lh1zz1reGoFsxiesRjgyIdazORl3OeZrJac88MGTIOFSOU9QJned93i2Rf oZ68XHdyIsOQOJnvcjJ+p7mItwVxvVZrDWMLi486Qf3uEqbKuNntZfmk3hD/RcDt 8eEAH0PH9gSsiYDQoMQ8LbnTfgFpLfJPF9BAr3MmqDX9Ju0PgnUvj+EY47a1x3U1 k5lFHUNvOKNRt1BZF4RpJPQsJOrvVm+X5f7rKa/Se8WGWphyKBF1qosAv1DsspiP 69UOG1ZOcExH74MHkYTSaaMD36cSIj3EK1KOyxp86bbhJUOusMWbJXNeUbAHZrsg eQ4XLbuDZUOYnSV8y2AY4Mx/f1blPGsy+nxoib2PPOiCySCp2DtDXFMPqRpb9sw1 6SrcyV5xPUDDApBdidvEj55iDdLPLt598Qrc3U3GrxSgtVJJEu+P79iJY7ikcrkf JB5tl3VT19zaj/2EHryTAVcrYxF9ZVkStoU6uqtYErrbaoOespIgxp9AMNhA1trS It2xYQqx+2f2+DGF1xBGul+fhpNWVi29ujmQodd8cyh1sAC/x9FuqprW6hXWYX5l EqqOwXJYfQY= =k4JI -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 26 12:04:49 2021 Received: (at control) by debbugs.gnu.org; 26 Feb 2021 17:04:49 +0000 Received: from localhost ([127.0.0.1]:42252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFgXp-00024t-9r for submit@debbugs.gnu.org; Fri, 26 Feb 2021 12:04:49 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:40637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFgXn-00024g-04 for control@debbugs.gnu.org; Fri, 26 Feb 2021 12:04:47 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 53400B15 for ; Fri, 26 Feb 2021 12:04:41 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 26 Feb 2021 12:04:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:content-type:content-transfer-encoding:mime-version:subject :message-id:date:to; s=fm3; bh=IKDzc5VqTEg0Rovz17AUyzvYUG0fYy5Ot J2YgZMnuWo=; b=HzAw2692ltk5J2MhoOjztRAuoLzMrOqRSoE1sGmOvjIbii1c2 G4E09KqcDFwJ3WmnTpSxW1iUbi3EOk5rH521RsVcJpx2FItfBw6n6B6KLjH+Kt4j XbeorKwzV0xL5JuEB8r1k9QP3JU/n7+69QPkWOEJ3hFQCI+b6nEbAf1hXP1EnNEw T+uA0iNnd7F75RvjB5bmXE+Di8gp+d5ZDGF41/4IC/nbdBayexKU3eo8HCucvI4I MSipOyjYZRylFJklwqvVH7NnDB9ysxApetwv4oZZOFvL5d2ZpkdWg00WbxE3HrOb NaVgumBvIKA8Xkja+3C6mVL3+SzyBUsfJjXvA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=IKDzc5 VqTEg0Rovz17AUyzvYUG0fYy5OtJ2YgZMnuWo=; b=avBtPewihhzQa3MQw+z7LL 5+LaXl321S7KfZyzSSfWOiY8ITR/m5n+Ho417jTDBv4QJz81VygSQWrBIJPqb20L zZ2tilFMWl3T/tVar9lbWIKeHZ3hCe6od5ZEX8JZCB1GwCrTu1PMVKa0XE7bnKlH coKy8tGoPSkx0xuwuTxG2W7U0AvW/G9xrezmvnGfuiJJPehBUCO+C2o5J81HOfxU aa3sYFK46mY73ixB60zTx+KgQJ+L3C7yewrmYAa2hTtzSYVDecVFXin0UqfrEMQU 0vmvUwYGzv2sVcEyPvSybogh17UUZ00RLDSJWQ4Q7rd9kGbmEyuEbdvAVN/8TKXQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrledugdellecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephfgtgfgguffkfffvofesthejmhdthh dtvdenucfhrhhomhepvegrrhhlucffohhnghcuoegtohhnthgrtghtsegtrghrlhguohhn ghdrmhgvqeenucggtffrrghtthgvrhhnpedtvdefleefffeujeeglefhiedtkeeiteefte fhffegkeevfeejhfduteehgeevfeenucfkphepleeirddvfeelrddujedrvdegvdenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohhnthgrtg htsegtrghrlhguohhnghdrmhgv X-ME-Proxy: Received: from [192.168.0.6] (pool-96-239-17-242.nycmny.fios.verizon.net [96.239.17.242]) by mail.messagingengine.com (Postfix) with ESMTPA id ADF5C108005C for ; Fri, 26 Feb 2021 12:04:40 -0500 (EST) From: Carl Dong Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Closing 46740 Message-Id: Date: Fri, 26 Feb 2021 12:04:40 -0500 To: control@debbugs.gnu.org X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control 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: -1.7 (-) close 46740 From unknown Wed Jun 18 23:16:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 27 Mar 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator