From patchwork Fri Jan 14 23:22:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 36353 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 06CF827BBEA; Fri, 14 Jan 2022 23:23:29 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 8DFA227BBE9 for ; Fri, 14 Jan 2022 23:23:28 +0000 (GMT) Received: from localhost ([::1]:48972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8Vup-0004GQ-PQ for patchwork@mira.cbaines.net; Fri, 14 Jan 2022 18:23:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8VuQ-0004Ez-TU for guix-patches@gnu.org; Fri, 14 Jan 2022 18:23:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8VuQ-0003j2-KX for guix-patches@gnu.org; Fri, 14 Jan 2022 18:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8VuQ-00033X-Hi for guix-patches@gnu.org; Fri, 14 Jan 2022 18:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53274] [PATCH 2/2] gnu: Add rofi-calc. References: <0TXkuQadzYQwj-0foNplpHZWW0BgPOtSnJ8rkZVBv41Y9wyWOIk4unT9d9nomiuoVcvoKK_P5JiXVvUNb7gIcJ-ro1jWuisYB8eEKxnbWGM=@protonmail.com> In-Reply-To: <0TXkuQadzYQwj-0foNplpHZWW0BgPOtSnJ8rkZVBv41Y9wyWOIk4unT9d9nomiuoVcvoKK_P5JiXVvUNb7gIcJ-ro1jWuisYB8eEKxnbWGM=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jan 2022 23:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "53274@debbugs.gnu.org" <53274@debbugs.gnu.org> Received: via spool by 53274-submit@debbugs.gnu.org id=B53274.164220255211679 (code B ref 53274); Fri, 14 Jan 2022 23:23:02 +0000 Received: (at 53274) by debbugs.gnu.org; 14 Jan 2022 23:22:32 +0000 Received: from localhost ([127.0.0.1]:38543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Vtv-00032I-Md for submit@debbugs.gnu.org; Fri, 14 Jan 2022 18:22:31 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:27336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Vtq-00031u-Bo for 53274@debbugs.gnu.org; Fri, 14 Jan 2022 18:22:30 -0500 Date: Fri, 14 Jan 2022 23:22:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1642202538; bh=EfR1BC6PYPBJUVtaGehnMs9f+ZwNVX1vzh4x/xKQNIk=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=OUSGWSslnKEpbZDgFKwvU7p+jO4xO4v4ACg/YCYDgd8FvGerVJ5Lh7kwHWeuOZH1e cT9dphKerysyLe5XHRoqD6zlR0yMFSGA2Su7ZZC6iMAxNj5Cda1KA9FqOUQQB8/rE0 C5D5hoXQA2Z48GysBuneDfJgTVF5oPssSSXyj0CfqmBN0FXjfJCPKsVcsmu+A/lzcT /WPnIgMemzEO+MtnjJ/F3CrUw9ccyMuiJW1WVwTnim+rZLIrz+DD7ju8UZ+Pb7d6AD WjPD1Bjx30XeuMmYAJvBTmNkzQ6Mlgrk1d6iVnp+Fsidhpd8tds0iHGhNmH+FGQ5QW BB5Rs8bj5Eb6g== Message-ID: 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From b7056b43e96109c907216ca1d17f68f2a1130d59 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 14 Jan 2022 18:13:08 -0500 Subject: [PATCH 2/2] gnu: Add rofi-calc. * gnu/packages/xdisorg.scm (rofi-calc): New variable. --- gnu/packages/xdisorg.scm | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 65cb1c947c..cb291f4634 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -78,6 +78,7 @@ (define-module (gnu packages xdisorg) #:use-module (guix build-system python) #:use-module (guix build-system scons) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module ((guix licenses) #:prefix license:) @@ -1741,6 +1742,51 @@ (define-public rofi by name.") (license license:expat))) +(define-public rofi-calc + (package + (name "rofi-calc") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/svenstaro/rofi-calc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j23xwa6s27wyx6r0yb85cby6dggrcb103nqcfxr5li1mcqrgd9m")))) + (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; Don't try to install directly to rofi, instead install + ;; to lib/rofi to match rofi's search-path ROFI_PLUGIN_PATH. + (add-after 'unpack 'patch-plugindir + (lambda _ + (substitute* "Makefile.am" + (("plugindir=\\$\\{rofi_PLUGIN_INSTALL_DIR\\}\\/") + "plugindir=${libdir}/rofi/")))) + (add-after 'unpack 'patch-qalc-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/calc.c" + (("\"qalc\"") + (string-append "\"" + (search-input-file inputs "bin/qalc") + "\"")))))))) + (inputs + (list cairo libqalculate rofi)) + (native-inputs + (list autoconf automake libtool pkg-config)) + (home-page + "https://github.com/svenstaro/rofi-calc") + (synopsis "Do live calculations in rofi with qalc") + (description + "@code{rofi-calc} is a rofi plugin that uses qalculate's @code{qalc} to parse +natural language input and provide results.") + (license license:expat))) + (define-public tint2 (package (name "tint2") -- 2.34.0