From patchwork Mon Aug 7 14:05:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 52608 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 85A5B27BBEC; Mon, 7 Aug 2023 15:17:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 7B6F327BBE9 for ; Mon, 7 Aug 2023 15:17:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qT11q-0000pa-N1; Mon, 07 Aug 2023 10:16:15 -0400 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 1qT11g-0000Uh-KT for guix-patches@gnu.org; Mon, 07 Aug 2023 10:16:09 -0400 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 1qT11f-0005jo-HY for guix-patches@gnu.org; Mon, 07 Aug 2023 10:16:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qT11f-0004l2-Cr for guix-patches@gnu.org; Mon, 07 Aug 2023 10:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64983] [PATCH v2 4/4] gnu: highlight: Fix paths for Perl bindings. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 14:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64983 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64983@debbugs.gnu.org Cc: gemmaro Received: via spool by 64983-submit@debbugs.gnu.org id=B64983.169141771618185 (code B ref 64983); Mon, 07 Aug 2023 14:16:03 +0000 Received: (at 64983) by debbugs.gnu.org; 7 Aug 2023 14:15:16 +0000 Received: from localhost ([127.0.0.1]:34045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10u-0004jF-2b for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:16 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:55681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10o-0004i6-JB for 64983@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:13 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1bc6624623cso13170605ad.3 for <64983@debbugs.gnu.org>; Mon, 07 Aug 2023 07:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691417705; x=1692022505; 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=bPNvXKWLEeZRjRG1IRFUOTOq92j4GtqqoHdo3KWOvyc=; b=WP0hlk3bs0yCSxIfilohLup6892udWsvG/cc4w1H4a/VsjU9aj0l0H9IloCgW4bxd3 qh8zaIiu9bvtGn4227wnC5HaijpTA8ii/XpFA56c7imGNo8k1vJP4U1XS/qldi/gr5Zg 594DYnp3uk8qaf6ilZWhe0HGut3h/LNAv1FGK2OjF/W9VLPv0fNcdj/JWocQVmo1Bq+G 5buEGaIOw0Op8TjV/LmXYmqQ+AUDBZpnkUSAS/ckQd589VFq5TsRC+tv+9b6mv37FQa+ HMfYWPs/3MhJewZLYyZDE35etZftQDSLcYTI8WTelp/6yhKbB4wv7q7CsP4x9AbFvNYY eDFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417705; x=1692022505; 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=bPNvXKWLEeZRjRG1IRFUOTOq92j4GtqqoHdo3KWOvyc=; b=Ab+yn9aeCa4+qiJHdH9jBb3d0fYyRKHP7jvpgVDEiOgCHPx8M96uFnc3ktG5eXhIFp +zUrq6VCOocB6Bdfse2PhlX2gBJDKFJ/zOcE++ZbDKpAkAE+oNuVqHAtgV26zhYg3YAk vf1G+xnUc/mF+RgxlIVbk+A6fh+bqHtaiE5Px6EVKqJugxs1X1Kz0pdvasrOBx8WYodS CP76GnMziYMlxiWrkhtIHGWE6erTXejKBItR4CK4Kq2CiwaEhFXSFkTUKRz343IDusVQ LyNfcUkfzJ/7oPt+CKk9M4OSH5QLQWvbfoApJHVFnfgCsMRyo+SsPG/jB8SncPzHmca+ 2+bg== X-Gm-Message-State: AOJu0Yw5WqLuW4Tz5K5xq3b02OhdmRACvy/GCwz+FDoue2nF3HqOUU8D vwbRX2qYGvLo0SmBYQbzCFW4U4yYv/o= X-Google-Smtp-Source: AGHT+IGOJvzC1W26Zzk+tAKS7NjbmZudM1D7/dxlDsCU9VWpCN9cc9QA7USqGjZCiamRSMOgJLR7Rw== X-Received: by 2002:a17:902:bb82:b0:1b8:8223:8bdd with SMTP id m2-20020a170902bb8200b001b882238bddmr8778212pls.59.1691417704824; Mon, 07 Aug 2023 07:15:04 -0700 (PDT) Received: from mac.gemmaro.name (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id ja4-20020a170902efc400b001b8013ed362sm6985191plb.96.2023.08.07.07.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:15:04 -0700 (PDT) From: gemmaro Date: Mon, 7 Aug 2023 23:05:42 +0900 Message-ID: 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/pretty-print.scm (highlight): Fix paths for Perl bindings. [arguments]: Set hl_data_dir and hl_conf_dir in install-perl-bindings phase. --- gnu/packages/pretty-print.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index f8763b7b74..5d15b160f3 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -414,14 +414,19 @@ (define-public highlight (string-append "PREFIX=" out))))) (add-after 'install 'install-perl-bindings (lambda* (#:key outputs #:allow-other-keys) - (let* ((perldir (string-append (assoc-ref outputs - "out") + (let* ((out (assoc-ref outputs "out")) + (data (string-append out + "/share/highlight/")) + (conf (string-append out "/etc/highlight/")) + (perldir (string-append out "/lib/perl5/site_perl/" #$(package-version perl))) (autodir (string-append perldir "/auto/highlight"))) (with-directory-excursion "extras/swig" - (invoke "make" "perl") + (invoke "make" "perl" + (string-append "hl_data_dir=" data) + (string-append "hl_conf_dir=" conf)) (invoke "perl" "-I" "." "testmod.pl") (install-file "highlight.pm" perldir) (install-file "highlight.so" autodir)))))