iproute: deprecate alias

This commit is contained in:
Sandro Jäckel
2021-04-04 01:43:46 +02:00
parent dd9862ba98
commit 9378fdf87e
71 changed files with 140 additions and 140 deletions
@@ -1,10 +1,10 @@
{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
, enableAlsaUtils ? true, alsaUtils, coreutils
, enableNetwork ? true, dnsutils, iproute, wirelesstools }:
, enableNetwork ? true, dnsutils, iproute2, wirelesstools }:
let
bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]
++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ];
++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ];
in
rustPlatform.buildRustPackage rec {
@@ -1,5 +1,5 @@
{ fetchFromGitHub, lib, stdenv, perl, makeWrapper
, iproute, acpi, sysstat, alsaUtils
, iproute2, acpi, sysstat, alsaUtils
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
"load_average" "memory" "volume" "wifi" ]
}:
@@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram $out/libexec/i3blocks/bandwidth \
--prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
--prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute2)}
wrapProgram $out/libexec/i3blocks/battery \
--prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
wrapProgram $out/libexec/i3blocks/cpu_usage \
--prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
wrapProgram $out/libexec/i3blocks/iface \
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)}
wrapProgram $out/libexec/i3blocks/volume \
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
'';