From patchwork Sun Oct 25 12:23:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 24803 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C848227BBF1; Sun, 25 Oct 2020 12:24:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DF29427BBF0 for ; Sun, 25 Oct 2020 12:24:12 +0000 (GMT) Received: from localhost ([::1]:47062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWf4F-0005qs-Li for patchwork@mira.cbaines.net; Sun, 25 Oct 2020 08:24:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWf46-0005pd-8Y for guix-patches@gnu.org; Sun, 25 Oct 2020 08:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWf45-0005WA-Uz for guix-patches@gnu.org; Sun, 25 Oct 2020 08:24:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWf45-0008OJ-Pj for guix-patches@gnu.org; Sun, 25 Oct 2020 08:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44170] [PATCH] gnu: Correct Inkscape extension dependencies Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Oct 2020 12:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44170 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: "44170@debbugs.gnu.org" <44170@debbugs.gnu.org> Received: via spool by 44170-submit@debbugs.gnu.org id=B44170.160362862832236 (code B ref 44170); Sun, 25 Oct 2020 12:24:01 +0000 Received: (at 44170) by debbugs.gnu.org; 25 Oct 2020 12:23:48 +0000 Received: from localhost ([127.0.0.1]:35907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWf3s-0008Nr-8v for submit@debbugs.gnu.org; Sun, 25 Oct 2020 08:23:48 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:57160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWf3o-0008NY-4X for 44170@debbugs.gnu.org; Sun, 25 Oct 2020 08:23:47 -0400 Date: Sun, 25 Oct 2020 12:23:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1603628616; bh=i/xGTzYsV2ZAXL1SvIARPrT7ecItLk7Cdgz7+/Meplw=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=YQuaMhTpwGuywi47VI8CGOiJkBvPbhbzSbgRoPL6NQO4NY7KYyFyJbY8NAlc6eTjR kx3Ye6kaFCq4EdFDnmxJf5YLg3B2AdExdrgACwUUrR2AncIsw+dzTWWPGP2H+Se3Vw D802KzgeveMgc/v4exnDokYuPD2gGMctYXPbmqGr1ncvO7eRbNAhhTfGG5u8IgG4Og kYmp7HzA8eGAVJTXlE8KB7o+XXRT0yYuGYh70L1THzJr/cluyf9+ZOwI+LIFxVPfss BI/5WI7gmgACml6NK/l20ziaaEz/dVU6t0bOT9QuNUItEYkmlI0iOiAjq25RqLIYFB iRvsD62Pniw/A== From: Ekaitz Zarraga Message-ID: In-Reply-To: <87r1pn9sqk.fsf@cbaines.net> References: <87mu0bbdqx.fsf@cbaines.net> <87r1pn9sqk.fsf@cbaines.net> MIME-Version: 1.0 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: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Christopher, Thanks for elaborating further ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ > → export PATH="/gnu/store/11l2qmzfgsp7k345mv6x1vn64q8330kw-python-wrapper-3.8.2/bin:${PATH:+:}$PATH" > > → echo $PATH > /gnu/store/11l2qmzfgsp7k345mv6x1vn64q8330kw-python-wrapper-3.8.2/bin::/gnu/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! 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. --- gnu/packages/inkscape.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) -- 2.28.0 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 © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Boris A. Dekshteyn +;;; Copyright © 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))))) (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 Inkscape