Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c4097c116e5f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db530f4490d7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 4, 2020

  1. 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.
    @andir
    andir authored and Jonathan Ringer committed Nov 4, 2020
    Copy the full SHA
    db530f4 View commit details
Showing with 20 additions and 3 deletions.
  1. +20 −3 pkgs/applications/window-managers/i3/status-rust.nix
23 changes: 20 additions & 3 deletions pkgs/applications/window-managers/i3/status-rust.nix
View file
Original file line number Diff line number Diff line change
@@ -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;