Change all alsaPlugins references to alsa-plugins

Also, refactor alsa-plugins to make it more readable.

+14 -6
+1 -1
pkgs/games/osu-lazer/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs 2 , dotnetCorePackages, dotnetPackages, cacert 3 - , ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsaPlugins 4 }: 5 6 let
··· 1 { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs 2 , dotnetCorePackages, dotnetPackages, cacert 3 + , ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsa-plugins 4 }: 5 6 let
+9 -3
pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix
··· 1 - { writeShellScriptBin, stdenv, alsaPlugins }: 2 - writeShellScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" '' 3 - ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@" 4 ''
··· 1 + { stdenv 2 + , alsa-plugins 3 + , writeShellScriptBin 4 + }: 5 + let 6 + arch = if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"; 7 + in 8 + writeShellScriptBin "ap${arch}" '' 9 + ALSA_PLUGIN_DIRS=${alsa-plugins}/lib/alsa-lib "$@" 10 ''
+2
pkgs/top-level/aliases.nix
··· 44 alienfx = throw "alienfx has been removed."; # added 2019-12-08 45 alsaLib = alsa-lib; # added 2021-06-09 46 alsaOss = alsa-oss; # added 2021-06-10 47 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 48 ammonite-repl = ammonite; # added 2017-05-02 49 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
··· 44 alienfx = throw "alienfx has been removed."; # added 2019-12-08 45 alsaLib = alsa-lib; # added 2021-06-09 46 alsaOss = alsa-oss; # added 2021-06-10 47 + alsaPlugins = alsa-plugins; # added 2021-06-10 48 + alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 49 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 50 ammonite-repl = ammonite; # added 2017-05-02 51 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
+2 -2
pkgs/top-level/all-packages.nix
··· 20105 alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; 20106 alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; 20107 alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; 20108 - alsaPlugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; 20109 - alsaPluginWrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; 20110 alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; 20111 alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; 20112 alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { };
··· 20105 alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; 20106 alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; 20107 alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; 20108 + alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; 20109 + alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; 20110 alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; 20111 alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; 20112 alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { };