From patchwork Wed Dec 15 22:10:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Justin Veilleux X-Patchwork-Id: 35244 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 4453E27BBEA; Wed, 15 Dec 2021 22:11:17 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 1036127BBE9 for ; Wed, 15 Dec 2021 22:11:17 +0000 (GMT) Received: from localhost ([::1]:46308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxcUV-0005QP-3f for patchwork@mira.cbaines.net; Wed, 15 Dec 2021 17:11:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxcUI-0005P6-Ud for guix-patches@gnu.org; Wed, 15 Dec 2021 17:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxcUI-0007iW-MR for guix-patches@gnu.org; Wed, 15 Dec 2021 17:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxcUI-0007OP-HE for guix-patches@gnu.org; Wed, 15 Dec 2021 17:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52526] [xdot: fix typelib path] Resent-From: Justin Veilleux Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Dec 2021 22:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52526 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 52526@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163960623228374 (code B ref -1); Wed, 15 Dec 2021 22:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Dec 2021 22:10:32 +0000 Received: from localhost ([127.0.0.1]:33909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxcTn-0007NV-Cu for submit@debbugs.gnu.org; Wed, 15 Dec 2021 17:10:31 -0500 Received: from lists.gnu.org ([209.51.188.17]:46936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxcTe-0007ND-P5 for submit@debbugs.gnu.org; Wed, 15 Dec 2021 17:10:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxcTd-0004hc-5o for guix-patches@gnu.org; Wed, 15 Dec 2021 17:10:21 -0500 Received: from mail.cock.li ([37.120.193.124]:52868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxcTW-0007RH-2a for guix-patches@gnu.org; Wed, 15 Dec 2021 17:10:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1639606205; bh=YodD5zQ3JxQ1S1CqR13q2ZqPMD+3Yw5FJU0cbBlwuvQ=; h=Date:To:From:Subject:From; b=Vx/Qu7om6+wUUDj9vMTVwa8oKbuYy9cNKN1o5miOz9Gh+5KUGQ6ITNbaXpSF0dXHy jOTUCPrN4rJ/dzoF6UrpcWfjF1vYVKCFtEyoo8Bx/jRdbwbWTrf/QMsZyBLEl+zE4y BzcaU/HnS/y1rs/gXNAvNnKXSkLh51+tA+BmFz/mjGJRy+DcUxmYny3iLEAXDDv5BT GGy30FovZ+scXtwf6dOfOjziI+JTyh2fvgDtynRxU158LKNI39qxO6p+L9BI0xkWx4 L/cAiM34Uvz8UG5OwmxmoduLFCE0V7st5NJS/uAf8YMtYTmn5J2YgPneN4TNkgHXWe l/YiBGfYcW0DQ== Message-ID: <4fff3bbd-b815-2e02-6685-82ee1e2bb135@cock.li> Date: Wed, 15 Dec 2021 17:10:03 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Content-Language: en-US From: Justin Veilleux Received-SPF: pass client-ip=37.120.193.124; envelope-from=terramorpha@cock.li; helo=mail.cock.li X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches Before this change, xdot simply crashed on launch. From 4fe39e9958fb446e0d26eaa2668d15c706fc4f88 Mon Sep 17 00:00:00 2001 From: terramorpha Date: Wed, 15 Dec 2021 17:01:02 -0500 Subject: [PATCH] gnu: xdot: Add harfbuzz Typelib path in wrap phase * gnu/packages/graphviz.scm (xdot)[#:phases]: Add harfbuzz's path to the wrapper. --- gnu/packages/graphviz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index c4dfd4965b..ab39e49d7d 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020 Pjotr Prins ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Giacomo Leidi +;;; Copyright © 2021 Justin Veilleux ;;; ;;; This file is part of GNU Guix. ;;; @@ -346,12 +347,14 @@ (define-public xdot (assoc-ref inputs "gtk+") "/lib/girepository-1.0" ":" (assoc-ref inputs "pango") "/lib/girepository-1.0" ":" (assoc-ref inputs "gdk-pixbuf") "/lib/girepository-1.0" - ":" (assoc-ref inputs "atk") "/lib/girepository-1.0"))) + ":" (assoc-ref inputs "atk") "/lib/girepository-1.0" + ":" (assoc-ref inputs "harfbuzz") "/lib/girepository-1.0"))) `("PATH" ":" prefix (,(dirname (search-input-file inputs "bin/dot")))))))))) (inputs (list atk librsvg + harfbuzz graphviz gtk+ python-pycairo -- 2.34.0