diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-06 08:54:28 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-06 08:54:28 +0200 |
| commit | 2420184727068aac826c056e4dbc7ad98e6435ee (patch) | |
| tree | 17e8ded1284f346ce8f67a980e69de517d1f3cb7 /pkgs/top-level | |
| parent | a7e2cb90aad35a8825e5084ef6803907773bc023 (diff) | |
| parent | 91a20dac08ff1c2483befe90ccbd59c5b16aabde (diff) | |
| download | nixlib-2420184727068aac826c056e4dbc7ad98e6435ee.tar nixlib-2420184727068aac826c056e4dbc7ad98e6435ee.tar.gz nixlib-2420184727068aac826c056e4dbc7ad98e6435ee.tar.bz2 nixlib-2420184727068aac826c056e4dbc7ad98e6435ee.tar.lz nixlib-2420184727068aac826c056e4dbc7ad98e6435ee.tar.xz nixlib-2420184727068aac826c056e4dbc7ad98e6435ee.tar.zst nixlib-2420184727068aac826c056e4dbc7ad98e6435ee.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f4df97b0ae8..a15111639572 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16217,6 +16217,10 @@ in alsaOss = callPackage ../os-specific/linux/alsa-oss { }; alsaTools = callPackage ../os-specific/linux/alsa-tools { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; + + alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { }; + inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware armTrustedFirmwareTools |