Merge master into staging-next

2021-05-11 00:48:15 +00:00
parent 61fa3fdde8 881d2af5ee
commit 49b8e6f7d4
69 changed files with 4881 additions and 8823 deletions
@@ -30,8 +30,19 @@ rustPlatform.buildRustPackage rec {
  cargoBuildFlags = [
    "--features=notmuch"
    "--features=maildir"
+    "--features=pulseaudio"
  ];

+  prePatch = ''
+    substituteInPlace src/util.rs \
+      --replace "/usr/share/i3status-rust" "$out/share"
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share
+    cp -R files/* $out/share
+  '';
+
  postFixup = ''
    wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin"
  '';