From patchwork Wed Dec 13 08:02:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57565 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 0D46127BBEA; Wed, 13 Dec 2023 08:04:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 9035727BBE2 for ; Wed, 13 Dec 2023 08:04:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDKDg-0005ib-Rf; Wed, 13 Dec 2023 03:03:52 -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 1rDKDd-0005gL-8J for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:49 -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 1rDKDc-0002B7-UZ for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDKDq-00038e-7V; Wed, 13 Dec 2023 03:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67808] [PATCH 3/5] gnu: font-jetbrains-mono: Use license-file-regexp argument Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 08:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67808@debbugs.gnu.org Cc: Saku Laesvuori , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 67808-submit@debbugs.gnu.org id=B67808.170245460711986 (code B ref 67808); Wed, 13 Dec 2023 08:04:02 +0000 Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:27 +0000 Received: from localhost ([127.0.0.1]:58124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDG-00037F-M0 for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:27 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:49756 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDC-00036r-Ka for 67808@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:23 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 0C2CE3400DF; Wed, 13 Dec 2023 09:03:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702454590; bh=06GdeqLHPpWNAIl/mZoJw7YpeB4gevrauCAoeO/pxUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M+zTLbZO6731FaXq1lTn2zMNTebpkZZomtdIpyB2sb9x3f8VjXyv0S1ZaRNh8qNDj 9wmnjCBLO5K3YmBZ63FhNUsXPJuXMhkkwuwL/UsF+ceCjL3oLF8YHl85KPAtKio7sT 9PQEPwKljncb049gZoxgQiOZ+bL8E1bMKffaeMaE= Date: Wed, 13 Dec 2023 10:02:36 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> 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: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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/fonts.scm (font-jetbrains-mono)[arguments]: Replace custom 'install-license-files build phase with license-file-regexp argument. Change-Id: Ie8b851b04c84c63c5e1abb1e75c9312b4729be57 --- gnu/packages/fonts.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f88a715fae..3f4f5ae847 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2512,13 +2512,8 @@ (define-public font-jetbrains-mono ;; Find the license file outside of the default subdirectory. (lambda _ (chdir "..") - #t)) - (replace 'install-license-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) - (install-file "OFL.txt" doc) - #t)))))) + #t))) + #:license-file-regexp "^OFL\\.txt$")) (home-page "https://www.jetbrains.com/lp/mono/") (synopsis "Mono typeface for developers") (description