From: phodina via Guix-patches via <guix-patches@gnu.org>
To: 52370@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#52370] [PATCH] gnu: i3status-rust: Add missing inputs.
Date: Wed, 08 Dec 2021 09:16:40 +0000 [thread overview]
Message-ID: <peHQ5s2Fy_jqrbuJSnslwHXk_TC2R_23YW5HOB7xth3-f7CC_5CnZDIlSLHnSbCXgRqpLnYha4x0ZAtPrEkv6ncGbSpgu1q-ps3QYgAw-24=@protonmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 278 bytes --]
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
[-- Attachment #1.2: Type: text/html, Size: 389 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-i3status-rust-Add-missing-inputs.patch --]
[-- Type: text/x-patch; name=0001-gnu-i3status-rust-Add-missing-inputs.patch, Size: 6249 bytes --]
From f5469445ec849136879fca29495fd7cfabaf4e04 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
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
next reply other threads:[~2021-12-08 9:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 9:16 phodina via Guix-patches via [this message]
2021-12-11 14:36 ` [bug#52370] [PATCH] gnu: i3status-rust: Add missing inputs Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='peHQ5s2Fy_jqrbuJSnslwHXk_TC2R_23YW5HOB7xth3-f7CC_5CnZDIlSLHnSbCXgRqpLnYha4x0ZAtPrEkv6ncGbSpgu1q-ps3QYgAw-24=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=52370@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
--cc=phodina@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.