From patchwork Thu Feb 22 16:10:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60893 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 5CD6927BBEA; Thu, 22 Feb 2024 16:18:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 03F1F27BBE2 for ; Thu, 22 Feb 2024 16:18:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkt-0003lS-Rf; Thu, 22 Feb 2024 11:17:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdBkg-0003Ul-9j for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdBkf-0004dd-Cn for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBl2-0003Vh-4d for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 19/20] gnu: inkscape: Fix Python support. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861861213323 (code B ref 68813); Thu, 22 Feb 2024 16:17:12 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:52 +0000 Received: from localhost ([127.0.0.1]:38644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkg-0003Si-Qu for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:51 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:54316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkO-0003Qa-5x for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:32 -0500 Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-42db60ebcd7so12056071cf.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:16:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618503; x=1709223303; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0UC/aDD0rQtBx60znlCczrt84/ofATGjG+lfaPVCsK4=; b=fG7lL1J4rDPlIgFiKCFYi3rSwpBb8jcRKV/+SbqcAiFrtIZzmdeFxUVv+5LaiSqVjD N9gFG6cocP5sscAQIgolLH3LFZ8i6Pfjn3MDuy8rcVft4LDliTEjfrR1tO39D6jf0x0I 0ePWuJ6YKEbmAq8k69ovPxgU+uVfI1sZxFBA/3V10Gvjsi3No2UfkS/6xHMjzPVDR3Da oQZJQtwHOYCjnVePkd9Z5O6kgA52t8Pv8mAJdjlYmbLBXW57PtGTKHjQ6fMwtuYlLRv5 E8zrwHa7kBxIONajMHm2qRBn3Yfz+veVC7/GTGsiBmOHLq10CBUOg6DHKBxownSfyw7y aDZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618503; x=1709223303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0UC/aDD0rQtBx60znlCczrt84/ofATGjG+lfaPVCsK4=; b=nxopdKzttLEEp/3IMVPfGPSpQUTWTqktWNE24EIix+4P4c6r+RADaKTCaD8YHzG/IM CoKjaiHCrP+3v5E2A5QFzHTDZyRgM+RoPs6+tJ8ZJZ4w14iguB9QJuLCKLjtpaMSrHKP BCyue3E4ZIaThTHjY+W4dWXOhj+9+Cd/k3upiZlZK2RT0M/pVPfCuYUaL1xtOuGe8LlB 3Mut9ww9nO1sPLztuHSTxjPBnPVmFPRDHf5t3l8Rg8G+syxwc2w3qUhSsiAEQ7WQwgaq vWAZLnsNd63yINTXoP3cgteCwizbO4S+4K/aXQ27/PAlASeukM5vinsvIWLPES6UPxor gk9A== X-Gm-Message-State: AOJu0YyHGz5lVZr06P9GCgRAFHw2wH2e7jYuFB2kZSIzGbLFwgtVlICq Jk/zBYsZS2ZD3X/kTZCxJuJXw3LaFiydKXnm2//zqnaXOfJ0VaUsHAasgRfH X-Google-Smtp-Source: AGHT+IHyPD1g2KLSUOtgmb6Lu5BaQjHZQho+yP7RtoMpkyrbrxicB3VMzSCybhWqdzSJU2YavqHZ9A== X-Received: by 2002:a0c:cd08:0:b0:68f:2beb:889 with SMTP id b8-20020a0ccd08000000b0068f2beb0889mr18055727qvm.12.1708618503461; Thu, 22 Feb 2024 08:15:03 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:15:03 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:18 -0500 Message-ID: <1d93033bebd313b0962552127b226a246e5b2149.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/inkscape.scm (inkscape/stable) [phases]: Wrap with PATH and GI_TYPELIB_PATH. [inputs]: Sort inputs. Add python-appdirs, python-cssselect, python-pygobject and python-requests. (inkscape) [inputs]: Do not append python-cssselect. Fixes: https://issues.guix.gnu.org/63938 Change-Id: I90a39a04a35dbcafe413726107d100c78d173fd0 --- gnu/packages/inkscape.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 5449bf8d92..aa33a0a4a3 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -245,14 +245,19 @@ (define-public inkscape/stable (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) (add-after 'install 'wrap-program ;; Ensure Python is available at runtime. - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (wrap-program (string-append #$output "/bin/inkscape") + `("PATH" prefix + (,(dirname (search-input-file inputs "bin/python")))) `("GUIX_PYTHONPATH" prefix (,(getenv "GUIX_PYTHONPATH"))) ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load ;; its own icons in pure environments. `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) + (,(getenv "GDK_PIXBUF_MODULE_FILE"))) + ;; Ensure GObject Introspection typelibs are found. + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs (list (librsvg-for-system) ;for the pixbuf loader autotrace @@ -279,9 +284,16 @@ (define-public inkscape/stable poppler popt potrace + ;; These Python dependencies are used by the Inkscape extension + ;; management system. To verify that it is working, visit the + ;; Extensions -> Manage Extensions... menu. + python-appdirs + python-cssselect python-lxml python-numpy + python-pygobject python-pyserial + python-requests python-scour python-wrapper readline)) @@ -337,8 +349,7 @@ (define-public inkscape `("GDK_PIXBUF_MODULE_FILE" = (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (inputs (modify-inputs (package-inputs inkscape/stable) - (append imagemagick ;for libMagickCore and libMagickWand - python-cssselect))) ;to render qrcode + (append imagemagick))) ;for libMagickCore and libMagickWand (native-inputs (modify-inputs (package-native-inputs inkscape/stable) ;; Only use 1 imagemagick across the package build.