diff --git a/pkgs/os-specific/linux/alsa-project/default.nix b/pkgs/os-specific/linux/alsa-project/default.nix new file mode 100644 index 000000000000..15077cc8d77a --- /dev/null +++ b/pkgs/os-specific/linux/alsa-project/default.nix @@ -0,0 +1,13 @@ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: { + alsa-firmware = self.callPackage ./alsa-firmware { }; + alsa-lib = self.callPackage ./alsa-lib { }; + alsa-oss = self.callPackage ./alsa-oss { }; + alsa-plugins = self.callPackage ./alsa-plugins { }; + alsa-plugins-wrapper = self.callPackage ./alsa-plugins/wrapper.nix { }; + alsa-tools = self.callPackage ./alsa-tools { }; + alsa-topology-conf = self.callPackage ./alsa-topology-conf { }; + alsa-ucm-conf = self.callPackage ./alsa-ucm-conf { }; + alsa-utils = self.callPackage ./alsa-utils { fftw = pkgs.fftwFloat; }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecfdef4b5675..ecd3ce9900a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25918,17 +25918,16 @@ with pkgs; tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; - 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 { }; - alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; - alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; - alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; - alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; - alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; - alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { - fftw = fftwFloat; - }; + inherit (callPackage ../os-specific/linux/alsa-project { }) + alsa-firmware + alsa-lib + alsa-oss + alsa-plugins + alsa-plugins-wrapper + alsa-tools + alsa-topology-conf + alsa-ucm-conf + alsa-utils; inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware