From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH 06b/10] gnu: Add function libiconv-if-needed. Date: Tue, 03 May 2016 18:56:49 +0200 Message-ID: <87shxzkrla.fsf_-_@drakenvlieg.flower> References: <1461942751-23883-1-git-send-email-janneke@gnu.org> <1461942751-23883-6-git-send-email-janneke@gnu.org> <9b320678-3af9-22c5-ead5-23126e43f57c@gmail.com> <87h9efbaeh.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axde0-0001lU-9P for guix-devel@gnu.org; Tue, 03 May 2016 12:58:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axddo-0001H1-71 for guix-devel@gnu.org; Tue, 03 May 2016 12:57:50 -0400 In-Reply-To: <87h9efbaeh.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 03 May 2016 14:20:38 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: And the second part Greetings, Jan --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0006b-gnu-Add-function-libiconv-if-needed.patch >From 9c00010dede03a2b59c5c18c25749bf14e6c9c10 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 3 May 2016 18:49:33 +0200 Subject: [PATCH 6b/10] gnu: Add function libiconv-if-needed. * gnu/packages/base.scm (libiconv-if-needed): New function. --- gnu/packages/base.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3819ecc..34dac61 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -959,6 +959,11 @@ program. It supports a wide variety of different encodings.") (home-page "http://www.gnu.org/software/libiconv/") (license lgpl3+))) +(define* (libiconv-if-needed #:optional (target (%current-target-system))) + (if (mingw-target? target) + `(("libiconv" ,libiconv)) + '())) + (define-public (canonical-package package) ;; Avoid circular dependency by lazily resolving 'commencement'. (let* ((iface (resolve-interface '(gnu packages commencement))) -- 2.7.3 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20 --=-=-=--