From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH 3/5] gnu: tzdata: Added "source" as input.
Date: Sat, 14 Dec 2013 19:24:58 +0100
Message-ID: <87vbyrthmt.fsf@gnu.org>
References: <1387043002-6138-1-git-send-email-john@darrington.wattle.id.au>
	<1387043002-6138-3-git-send-email-john@darrington.wattle.id.au>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35453)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Vrtti-0005ui-LI
	for guix-devel@gnu.org; Sat, 14 Dec 2013 13:25:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Vrttc-0002xU-0o
	for guix-devel@gnu.org; Sat, 14 Dec 2013 13:25:06 -0500
Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:23447)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1Vrttb-0002xB-H0
	for guix-devel@gnu.org; Sat, 14 Dec 2013 13:24:59 -0500
In-Reply-To: <1387043002-6138-3-git-send-email-john@darrington.wattle.id.au>
	(John Darrington's message of "Sat, 14 Dec 2013 18:43:20 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: John Darrington <john@darrington.wattle.id.au>
Cc: guix-devel@gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

John Darrington <john@darrington.wattle.id.au> skribis:

> --- a/gnu/packages/base.scm
> +++ b/gnu/packages/base.scm
> @@ -535,7 +535,8 @@ with the Linux kernel.")
>               (delete-file-recursively (string-append out "/share/zoneinf=
o-posix"))
>               (delete-file-recursively (string-append out "/share/zoneinf=
o-leaps"))))
>           (alist-delete 'configure %standard-phases)))))
> -    (inputs `(("tzcode" ,(origin
> +    (inputs `(("source" ,source)
> +              ("tzcode" ,(origin
>                            (method url-fetch)

Actually the problem was that =E2=80=9Csource=E2=80=9D is in =E2=80=98nativ=
e-inputs=E2=80=99 when
cross-compiling (see build-system/gnu.scm.)

I fixed it differently in commit c94d01b:


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -520,8 +520,8 @@ with the Linux kernel.")
        #:phases
        (alist-replace
         'unpack
-        (lambda* (#:key inputs #:allow-other-keys)
-          (and (zero? (system* "tar" "xvf" (assoc-ref inputs "source")))
+        (lambda* (#:key source inputs #:allow-other-keys)
+          (and (zero? (system* "tar" "xvf" source))
                (zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode")))))
         (alist-cons-after
          'install 'post-install

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable


Thanks!

Ludo=E2=80=99.

--=-=-=--