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 qG6BOvzxll+dUwAA0tVLHw (envelope-from ) for ; Mon, 26 Oct 2020 15:57:48 +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 sKpzNvzxll+8BwAA1q6Kng (envelope-from ) for ; Mon, 26 Oct 2020 15:57:48 +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 3FBA09401BF for ; Mon, 26 Oct 2020 15:57:48 +0000 (UTC) Received: from localhost ([::1]:52240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX4sV-0005rz-11 for larch@yhetil.org; Mon, 26 Oct 2020 11:57:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX4rm-0005i9-Kh for guix-patches@gnu.org; Mon, 26 Oct 2020 11:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kX4rm-00056y-90 for guix-patches@gnu.org; Mon, 26 Oct 2020 11:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kX4rm-0000DF-7B for guix-patches@gnu.org; Mon, 26 Oct 2020 11:57:02 -0400 Subject: bug#44170: [PATCH] gnu: Correct Inkscape extension dependencies Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 26 Oct 2020 15:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 44170 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ekaitz Zarraga Cc: 44170-done@debbugs.gnu.org Mail-Followup-To: 44170@debbugs.gnu.org, mail@cbaines.net, ekaitz@elenq.tech Received: via spool by 44170-done@debbugs.gnu.org id=D44170.1603727787761 (code D ref 44170); Mon, 26 Oct 2020 15:57:02 +0000 Received: (at 44170-done) by debbugs.gnu.org; 26 Oct 2020 15:56:27 +0000 Received: from localhost ([127.0.0.1]:40960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kX4rC-0000CC-Or for submit@debbugs.gnu.org; Mon, 26 Oct 2020 11:56:27 -0400 Received: from mira.cbaines.net ([212.71.252.8]:33942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kX4rB-0000C4-Hy for 44170-done@debbugs.gnu.org; Mon, 26 Oct 2020 11:56:26 -0400 Received: from localhost (92.41.179.191.threembb.co.uk [92.41.179.191]) by mira.cbaines.net (Postfix) with ESMTPSA id 5A8ED27BBF1; Mon, 26 Oct 2020 15:56:24 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 4916e084; Mon, 26 Oct 2020 15:56:21 +0000 (UTC) References: <87mu0bbdqx.fsf@cbaines.net> <87r1pn9sqk.fsf@cbaines.net> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: Date: Mon, 26 Oct 2020 15:56:21 +0000 Message-ID: <87r1plyo9m.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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 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-Spam-Score: -3.11 X-TUID: jah/uzf1LeuF --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ekaitz Zarraga writes: > Hi Christopher, > > Thanks for elaborating further > > =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original = Message =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 >> =E2=86=92 export PATH=3D"/gnu/store/11l2qmzfgsp7k345mv6x1vn64q8330kw-pyt= hon-wrapper-3.8.2/bin:${PATH:+:}$PATH" >> >> =E2=86=92 echo $PATH >> /gnu/store/11l2qmzfgsp7k345mv6x1vn64q8330kw-python-wrapper-3.8.2/bin::/g= nu/store/hgh67ilwsbx6v2irc7vgrnv354cv4h8a-profile/bin >> >> Note the double colon, I don't think it's a problem in terms of >> functionality, but just in case someone copies this from inkscape as an >> example, it would be good not to do the same here. >> >> Note, there's no need to fix this in kicad. If you do want to, I'd >> submit a separate commit under a seperate bug. >> > > I see! thanks! > >> > wasn't an input before? is it just an error? >> >> Well, error is a strong word, in this case, given the build system >> doesn't support building for a non-native architecture, it's sort of a >> non-issue. But I would view it as something you're fixing in addition to >> the changes you're making. >> >> It didn't (and still doesn't to some extent) matter that the Python >> stuff was/is in native-inputs, because cross building this package is >> impossible because of the build system. >> >> However, in case the build system changes to support this, to be >> consistent with other package definitions, and to be consistent with the >> general rule that you don't reference native-inputs from the outputs (at >> least I think that's a rule or at least strong convention), having the >> Python stuff in inputs is better. Even if the package builds just the >> same. > > > I see what you mean, great. > I just moved python-wrapper to inputs and separated the commit so now > it's just inkscape's changes. > > Thanks for your patience! You're welcome :) I made some tweaks (described below) and pushed this as 24b233d45c2a04a7a011397234b29fd5d7133110. > From 5c3043aea4d98823089b8438bb4573d32e28d899 Mon Sep 17 00:00:00 2001 > From: Ekaitz Zarraga > Date: Sun, 25 Oct 2020 13:04:15 +0100 > Subject: [PATCH] gnu: Correct Inkscape extension dependencies > > * gnu/packages/inkscape.scm (inkscape@1.0.1): Add dependencies. I rewrote the commit message to the following, I think this is more in line with the style. gnu: inkscape: Correct extension dependencies. * gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Add wrap-program pha= se. [inputs]: Move python-wrapper to inputs, and add several python libraries. [native-inputs]: Remove python-wrapper, as it has moved to inputs. > --- > gnu/packages/inkscape.scm | 30 ++++++++++++++++++++++++++---- > 1 file changed, 26 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm > index 4ac3cf3966..66756b70a6 100644 > --- a/gnu/packages/inkscape.scm > +++ b/gnu/packages/inkscape.scm > @@ -6,6 +6,7 @@ > ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2020 Maxim Cournoyer > ;;; Copyright =C2=A9 2020 Boris A. Dekshteyn > +;;; Copyright =C2=A9 2020 Ekaitz Zarraga > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -44,6 +45,7 @@ > #:use-module (gnu packages pdf) > #:use-module (gnu packages popt) > #:use-module (gnu packages python) > + #:use-module (gnu packages python-xyz) > #:use-module (gnu packages xml) > #:use-module (gnu packages ghostscript) > #:use-module (gnu packages fontutils) > @@ -250,7 +252,23 @@ endif()~%~%" > (add-after 'install 'glib-or-gtk-compile-schemas > (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-= schemas)) > (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap > - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) > + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) > + (add-after 'install 'wrap-program > + ;; Ensure correct Python at runtime. > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (python (assoc-ref inputs "python")) > + (file (string-append out "/bin/inkscape")) > + (path (string-append > + out > + "/lib/python" > + ,(version-major+minor > + (package-version python)) > + "/site-packages:" > + (getenv "PYTHONPATH")))) > + (wrap-program file > + `("PYTHONPATH" ":" prefix (,path)))) > + #t))))) As before, because inkscape's lib doesn't contain anything Python related, I just wrapped with the PYTHONPATH. > (inputs > `(("aspell" ,aspell) > ("autotrace" ,autotrace) > @@ -275,15 +293,19 @@ endif()~%~%" > ("popt" ,popt) > ("potrace" ,potrace) > ("lcms" ,lcms) > - ("boost" ,boost))) > + ("boost" ,boost) > + ("python" ,python-wrapper) > + ("python-scour" ,python-scour) > + ("python-pyserial" ,python-pyserial) > + ("python-numpy" ,python-numpy) > + ("python-lxml" ,python-lxml))) > (native-inputs > `(("imagemagick" ,imagemagick) ;for tests > ("intltool" ,intltool) > ("glib" ,glib "bin") > ("googletest" ,googletest) > ("perl" ,perl) > - ("pkg-config" ,pkg-config) > - ("python" ,python-wrapper))) > + ("pkg-config" ,pkg-config))) > (home-page "https://inkscape.org/") > (synopsis "Vector graphics editor") > (description "Inkscape is a vector graphics editor. What sets Inksc= ape --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+W8aVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfqKA/+K7NzpMY1fVI3MLIjoGaVy1ufKrsQ5AkZ kMcAw5Ob6cQ3HhqzwFM4cGkHxT37sPC2basD9BNNp5rSJ5pXHICDmUB5IBNnIM+C SfI5WFHGn/S0mCh7HB6rbJqhDj/7IUD1yPb+uUoIkTb68IjcHRTIBfg/IV+7Jsv6 m3qi0bG+aP/xc4HUq14ucC5FK28I8sn0D0psagCRrfA3JUAYfKwPtcPUAsrzpMW8 70GLljQHx2/qYFIg53GgBPe4sE/jBkcZKzX3wv0mFRARPynCjGmEKIVw/KAHsFdX VXrWc77ReJYcUiV0FX2vsshbwGw7j7BFOI8/3vmRR6BWm2f/x6UlGPt59HL43wJZ YNBmq9togYbpX1q84eRBZbhAPXjgSlGq/mNibm0kA4e+JkBRxfmgzFKMfRt+CEND m5A2cSow545k9Ir4r2sX4kMzVvDwklakaYLfpYkoUCUur90en32IyyTvqt18cy12 ACZwsy4SiV3Os2gopnqdO5H+/wbD71Kqz6B6yodW9GsqYBHcI4Gc5gM33vaSNW4w WEJ/u60VD2q17BgA/EupooZ6DEevfMSU2C/XYluaC+Ht1bH6XKcm3cksLckBhX+8 4uQkIgvzCHN7dgyGH5knUuZZXM/QDr0l4BxzVoHnJFTKvUgdSZuVYu0SeaRrc4a6 4V3qbqZjWRg= =owAA -----END PGP SIGNATURE----- --=-=-=--