From db530f4490d7474e253bfe01b582d7b755e35799 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 4 Nov 2020 01:14:28 +0100 Subject: [PATCH] i3status-rust: add missing ethtool and notmuch buildInputs i3status-rust requires `ethtool` for the net block to work since 0.14.2. The notmuch feature is also available and all we've to do for that is to pass the `notmuch` input and enable the feature. --- .../window-managers/i3/status-rust.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index f6acf5698f4c..a1900deb2257 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,4 +1,13 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkgconfig +, makeWrapper +, dbus +, libpulseaudio +, notmuch +, ethtool +}: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; @@ -13,9 +22,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dcfclk8lbqvq2hywr80jm63p1i1kz3893zq99ipgryia46vd397"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ dbus libpulseaudio ]; + buildInputs = [ dbus libpulseaudio notmuch ]; + + cargoBuildFlags = [ + "--features=notmuch" + ]; + + postFixup = '' + wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" + ''; # Currently no tests are implemented, so we avoid building the package twice doCheck = false;