From 5d5c872bdffb0542662516aec96ae05d3762fbe1 Mon Sep 17 00:00:00 2001 From: FavoritoHJS <69703458+FavoritoHJS@users.noreply.github.com> Date: Tue, 26 Sep 2023 16:00:44 +0000 Subject: [PATCH 1/2] licenses: add Fraunhofer FDK AAC Codec Library This license is used by the Fraunhofer FDK codec, which is currently mislicensed to Apache 2.0. Of course, this can't be corrected without having the proper license available in lib.licenses can't it?? Thanks @trofi for noticing this has an SPDX ID. --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 0fd641085374..615a6b388153 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -481,6 +481,11 @@ in mkLicense lset) ({ free = false; }; + fraunhofer-fdk = { + fullName = "Fraunhofer FDK AAC Codec Library"; + spdxId = "FDK-AAC"; + }; + free = { fullName = "Unspecified free software license"; }; From 73fbd396790ab94e8a36158e7e82abf383703716 Mon Sep 17 00:00:00 2001 From: FavoritoHJS <69703458+FavoritoHJS@users.noreply.github.com> Date: Tue, 26 Sep 2023 16:03:41 +0000 Subject: [PATCH 2/2] fdk-aac: change license to fraunhofer-fdk This library was originally mislicensed as Apache 2.0, as that's the license used by the project that has this library. However the library still has the original license on it, so i'm fairly certain that's the wrong license. --- pkgs/development/libraries/fdk-aac/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 71077d6e315e..99e211877da1 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-quality implementation of the AAC codec from Android"; homepage = "https://sourceforge.net/projects/opencore-amr/"; - license = licenses.asl20; + license = licenses.fraunhofer-fdk; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; };