From patchwork Wed Dec 8 09:16:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 35014 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 13F7D27BBEA; Wed, 8 Dec 2021 09:17:14 +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,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 69B4527BBE9 for ; Wed, 8 Dec 2021 09:17:13 +0000 (GMT) Received: from localhost ([::1]:49014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mut4Z-0007xw-FL for patchwork@mira.cbaines.net; Wed, 08 Dec 2021 04:17:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mut4R-0007xm-70 for guix-patches@gnu.org; Wed, 08 Dec 2021 04:17:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mut4Q-0002Ar-VQ for guix-patches@gnu.org; Wed, 08 Dec 2021 04:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mut4Q-000333-Lv for guix-patches@gnu.org; Wed, 08 Dec 2021 04:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52370] [PATCH] gnu: i3status-rust: Add missing inputs. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Dec 2021 09:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52370 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52370@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.163895501211695 (code B ref -1); Wed, 08 Dec 2021 09:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Dec 2021 09:16:52 +0000 Received: from localhost ([127.0.0.1]:39532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mut4F-00032Y-It for submit@debbugs.gnu.org; Wed, 08 Dec 2021 04:16:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:50660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mut4D-00032Q-7W for submit@debbugs.gnu.org; Wed, 08 Dec 2021 04:16:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mut4D-0007wv-1I for guix-patches@gnu.org; Wed, 08 Dec 2021 04:16:49 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:16665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mut49-00027k-P2 for guix-patches@gnu.org; Wed, 08 Dec 2021 04:16:48 -0500 Date: Wed, 08 Dec 2021 09:16:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1638955002; bh=1pVhpQqp5TtzxrrsTJD7kyrAQP6bATFjv4V8qsQ+4iA=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:From:To:Cc; b=IOyIZp/dkR1HwY8ovirpsRY8FDPJQUyW1CSoTRmFVpWCBLWKVGEZzdOS4EQFpj+eL evvCd2FjivRkZ1lQz9PDEc/2R/r2MrFKXo8h1Dxs6Kz0cjjiNJd9naGZlVS9B9sj84 87D/2LDdU6bGK75BxScVp6fdMBQQKrX0tKjn0juGUJBtdQaLR7nsesBU4XtSltFWu3 +BXQCnQmJKrlNE8kh/HVRcclLXJtiUi4XTQaRwKABgMGXolPKqWeLGEZLbExAUAxra s+nl96fDRozJ46aywZ2CJ9yZVHFoyXzZZhBwjJJYjSq+mrbMScF+uuHkemI6F5Vvcs wmu+7Q7uOLLMQ== Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=phodina@protonmail.com; helo=mail-4322.protonmail.ch 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, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, here's an update of i3status-rust package. There are additional inputs and the whole binary is wrapped as it executes shell commands. I double checked if it works correctly by running it within guix shell environment. ./pre-inst-env guix shell --check --pure i3status-rust From f5469445ec849136879fca29495fd7cfabaf4e04 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 8 Dec 2021 03:30:15 +0100 Subject: [PATCH] gnu: i3status-rust: Add missing inputs. * gnu/packages/rust-apps (i3status-rust)[inputs]: Add alsa-utils, bash-minmal, coreutils, ibus, iproute, kdeconnect, lm-sensors, setxkbmap, speedtest-cli, xdg-utils, xrandr. [arguments]: Add phase to wrap-program bin/i3status-rs. * gnu/local.mk: Add patch (change not applied in 575fcd3045ff1649e5319b6701ff9e28e97793e0) diff --git a/gnu/local.mk b/gnu/local.mk index b91d6eaa62..45f25ddfbb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1741,6 +1741,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-adblock-ignore-live-tests.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ + %D%/packages/patches/i3status-rust-enable-unstable-features.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 136885bc23..41d54843ff 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -39,16 +39,22 @@ (define-module (gnu packages rust-apps) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) + #:use-module (gnu packages ibus) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages kde) #:use-module (gnu packages linux) + #:use-module (gnu packages networking) #:use-module (gnu packages ssh) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) @@ -56,7 +62,8 @@ (define-module (gnu packages rust-apps) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rust) #:use-module (gnu packages tls) - #:use-module (gnu packages version-control)) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xorg)) (define-public agate (package @@ -527,24 +534,16 @@ (define-public i3status-rust (name "i3status-rust") (version "0.20.1") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/greshake/i3status-rust") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (patches (search-patches "i3status-rust-enable-unstable-features.patch")) - (sha256 - (base32 "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/greshake/i3status-rust") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "i3status-rust-enable-unstable-features.patch")) + (sha256 + (base32 "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s")))) (build-system cargo-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("curl" ,curl) - ("dbus" ,dbus) - ("pulseaudio" ,pulseaudio) - ("openssl" ,openssl) - ("zlib" ,zlib))) (arguments `(#:features '("pulseaudio" "libpulse-binding") #:install-source? #f @@ -574,6 +573,10 @@ (define-public i3status-rust (("rust-assert-fs" ,rust-assert-fs-1)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1") + #t)) (add-after 'unpack 'fix-resources-path (lambda* (#:key outputs #:allow-other-keys) (let ((resources (string-append %output "/share"))) @@ -582,10 +585,38 @@ (define-public i3status-rust (add-after 'install 'install-resources (lambda* (#:key outputs #:allow-other-keys) (copy-recursively "files" (string-append %output "/share")))) - (add-after 'unpack 'enable-unstable-features - (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - #t))))) + (add-after 'install 'wrap-i3status + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (paths (map + (lambda (input) + (string-append (assoc-ref inputs input) "/bin")) + '("alsa-utils" "coreutils" "curl" "dbus" "ibus" "iproute" + "kdeconnect" "lm-sensors" "pulseaudio" + "openssl" + "setxkbmap" "speedtest-cli" "xdg-utils" "xrandr" + "zlib")))) + (wrap-program (string-append out "/bin/i3status-rs") `("PATH" prefix + ,paths)))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-utils" ,alsa-utils) + ("bash-minimal" ,bash-minimal) + ("coreutils" ,coreutils) + ("curl" ,curl) + ("dbus" ,dbus) + ("ibus" ,ibus) + ("iproute" ,iproute) + ("kdeconnect" ,kdeconnect) + ("lm-sensors" ,lm-sensors) + ("pulseaudio" ,pulseaudio) + ("openssl" ,openssl) + ("setxkbmap" ,setxkbmap) + ("speedtest-cli" ,speedtest-cli) + ("xdg-utils" ,xdg-utils) + ("xrandr" ,xrandr) + ("zlib" ,zlib))) (home-page "https://github.com/greshake/i3status-rust") (synopsis "i3status, written in pure Rust") (description "@code{i3status-rs} is a feature-rich and resource-friendly -- 2.34.0