Change all alsaPlugins references to alsa-plugins

Also, refactor alsa-plugins to make it more readable.
This commit is contained in:
AndersonTorres 2021-06-10 00:24:32 -03:00
parent 58fc582fe8
commit 0b045a37fc
4 changed files with 14 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnetCorePackages, dotnetPackages, cacert
, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsaPlugins
, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsa-plugins
}:
let

View File

@ -1,4 +1,10 @@
{ writeShellScriptBin, stdenv, alsaPlugins }:
writeShellScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" ''
ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@"
{ stdenv
, alsa-plugins
, writeShellScriptBin
}:
let
arch = if stdenv.hostPlatform.system == "i686-linux" then "32" else "64";
in
writeShellScriptBin "ap${arch}" ''
ALSA_PLUGIN_DIRS=${alsa-plugins}/lib/alsa-lib "$@"
''

View File

@ -44,6 +44,8 @@ mapAliases ({
alienfx = throw "alienfx has been removed."; # added 2019-12-08
alsaLib = alsa-lib; # added 2021-06-09
alsaOss = alsa-oss; # added 2021-06-10
alsaPlugins = alsa-plugins; # added 2021-06-10
alsaPluginWrapper = alsa-plugins-wrapper; # 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
ammonite-repl = ammonite; # added 2017-05-02
amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09

View File

@ -20105,8 +20105,8 @@ in
alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { };
alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { };
alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { };
alsaPlugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { };
alsaPluginWrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { };
alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { };
alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { };
alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; };
alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { };
alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { };