diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 5fd0d88831a..ea7ad1015be 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -6,7 +6,7 @@ , aoSupport ? !stdenv.isLinux, libao ? null , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null -, ossSupport ? false, alsaOss ? null +, ossSupport ? false, alsa-oss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null , mprisSupport ? stdenv.isLinux, systemd ? null @@ -59,7 +59,7 @@ let (mkFlag aoSupport "CONFIG_AO=y" libao) (mkFlag jackSupport "CONFIG_JACK=y" libjack) (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) - (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) + (mkFlag ossSupport "CONFIG_OSS=y" alsa-oss) (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) (mkFlag mprisSupport "CONFIG_MPRIS=y" systemd) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1686a8eb20b..a1a4379be7b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -43,6 +43,7 @@ mapAliases ({ aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 alienfx = throw "alienfx has been removed."; # added 2019-12-08 alsaLib = alsa-lib; # added 2021-06-09 + alsaOss = alsa-oss; # 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index baeecda0a2c..b48159f8848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20104,10 +20104,10 @@ 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 { }; alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; - alsaOss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { };