Change all alsaUtils references to alsa-utils

This commit is contained in:
AndersonTorres 2021-06-10 01:10:52 -03:00
parent 7b8a56a577
commit f1242006c9
11 changed files with 26 additions and 25 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: { lib, stdenv, fetchurl, makeWrapper, python3, alsa-utils, timidity }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "20.12"; version = "20.12";
@ -10,13 +10,13 @@
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 alsaUtils timidity ]; buildInputs = [ python3 alsa-utils timidity ];
patchPhase = '' patchPhase = ''
sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' mma-splitrec
sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' util/mma-splitrec.py sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' util/mma-splitrec.py
sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' mma-splitrec sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' mma-splitrec
sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' util/mma-splitrec.py
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py
find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g'

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsa-lib, alsaUtils, fltk, libjack2, libXft, { lib, stdenv, fetchurl, alsa-lib, alsa-utils, fltk, libjack2, libXft,
libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./fltk-path.patch ]; patches = [ ./fltk-path.patch ];
buildInputs = [ alsa-lib alsaUtils fltk libjack2 libXft libXpm libjpeg buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ]; libpng libsamplerate libsndfile zlib ];
meta = with lib; { meta = with lib; {

View file

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, bundlerEnv , bundlerEnv
, alsaUtils , alsa-utils
, atk , atk
, copyDesktopItems , copyDesktopItems
, gobject-introspection , gobject-introspection
@ -87,11 +87,11 @@ with mikutterPaths; stdenv.mkDerivation rec {
libnotify libnotify
which # some plugins use it at runtime which # some plugins use it at runtime
wrappedRuby wrappedRuby
] ++ lib.optionals stdenv.isLinux [ alsaUtils ]; ] ++ lib.optionals stdenv.isLinux [ alsa-utils ];
scriptPath = lib.makeBinPath ( scriptPath = lib.makeBinPath (
[ wrappedRuby libnotify which ] [ wrappedRuby libnotify which ]
++ lib.optionals stdenv.isLinux [ alsaUtils ] ++ lib.optionals stdenv.isLinux [ alsa-utils ]
); );
postUnpack = '' postUnpack = ''

View file

@ -1,9 +1,9 @@
{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
, enableAlsaUtils ? true, alsaUtils, coreutils , enableAlsaUtils ? true, alsa-utils, coreutils
, enableNetwork ? true, dnsutils, iproute2, wirelesstools }: , enableNetwork ? true, dnsutils, iproute2, wirelesstools }:
let let
bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] bins = lib.optionals enableAlsaUtils [ alsa-utils coreutils ]
++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ]; ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ];
in in

View file

@ -1,5 +1,5 @@
{ fetchFromGitHub, lib, stdenv, perl, makeWrapper { fetchFromGitHub, lib, stdenv, perl, makeWrapper
, iproute2, acpi, sysstat, alsaUtils , iproute2, acpi, sysstat, alsa-utils
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
"load_average" "memory" "volume" "wifi" ] "load_average" "memory" "volume" "wifi" ]
}: }:
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/libexec/i3blocks/iface \ wrapProgram $out/libexec/i3blocks/iface \
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)} --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)}
wrapProgram $out/libexec/i3blocks/volume \ wrapProgram $out/libexec/i3blocks/volume \
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsa-utils)}
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsaUtils { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsa-utils
, libnotify, which, jeepney, loguru, pytestCheckHook }: , libnotify, which, jeepney, loguru, pytestCheckHook }:
buildPythonPackage rec { buildPythonPackage rec {
@ -15,7 +15,7 @@ buildPythonPackage rec {
}; };
propagatedNativeBuildInputs = [ which ] propagatedNativeBuildInputs = [ which ]
++ lib.optionals stdenv.isLinux [ alsaUtils libnotify ]; ++ lib.optionals stdenv.isLinux [ alsa-utils libnotify ];
propagatedBuildInputs = [ loguru ] propagatedBuildInputs = [ loguru ]
++ lib.optionals stdenv.isLinux [ jeepney ]; ++ lib.optionals stdenv.isLinux [ jeepney ];

View file

@ -14,7 +14,7 @@
, file , file
, acpi , acpi
, coreutils , coreutils
, alsaUtils , alsa-utils
, i3 , i3
, procps , procps
, lm_sensors , lm_sensors
@ -40,7 +40,7 @@ buildPythonPackage rec {
sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py
sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py
sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py
sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py sed -i -e "s|'amixer|'${alsa-utils}/bin/amixer|" py3status/modules/volume_status.py
sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py
sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py
sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py

View file

@ -1,7 +1,7 @@
{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook { lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook
, buildPythonApplication, pycairo, pygobject3 , buildPythonApplication, pycairo, pygobject3
, gobject-introspection, gtk3, librsvg , gobject-introspection, gtk3, librsvg
, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond , alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
}: }:
buildPythonApplication rec { buildPythonApplication rec {
@ -24,7 +24,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [ pycairo pygobject3 ]; propagatedBuildInputs = [ pycairo pygobject3 ];
preBuild = '' preBuild = ''
sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
-e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \ -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \
-e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \ -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \
-e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \ -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \

View file

@ -1,5 +1,5 @@
{ alsa-lib { alsa-lib
, alsaUtils , alsa-utils
, autoPatchelfHook , autoPatchelfHook
, cifs-utils , cifs-utils
, fetchurl , fetchurl
@ -24,7 +24,7 @@
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
alsaUtils alsa-utils
cifs-utils cifs-utils
ffmpeg ffmpeg
freetype freetype
@ -48,7 +48,7 @@
ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin}
''; '';
wrapFix = bin: '' wrapFix = bin: ''
wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]} wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}
''; '';
in in
'' ''

View file

@ -47,6 +47,7 @@ mapAliases ({
alsaPlugins = alsa-plugins; # added 2021-06-10 alsaPlugins = alsa-plugins; # added 2021-06-10
alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10
alsaTools = alsa-tools; # added 2021-06-10 alsaTools = alsa-tools; # added 2021-06-10
alsaUtils = alsa-utils; # added 2021-06-10
amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
ammonite-repl = ammonite; # added 2017-05-02 ammonite-repl = ammonite; # added 2017-05-02
amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09

View file

@ -20108,7 +20108,7 @@ in
alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { };
alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { };
alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { };
alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; };
alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { };
alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { };