From f3352f3240ba3bf70ba513bcf54dc88385e9909d Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sat, 16 May 2020 20:14:42 +0100 Subject: [PATCH 1/2] maintainers: add lunik1 --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc2ea541d69..e7980425a2d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4603,6 +4603,16 @@ githubId = 26020062; name = "lumi"; }; + lunik1 = { + email = "ch.nixpkgs@themaw.xyz"; + github = "lunik1"; + githubId = 13547699; + name = "Corin Hoad"; + keys = [{ + longkeyid = "rsa2048/0x6A37DF9483188492"; + fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; + }]; + }; luz = { email = "luz666@daum.net"; github = "Luz"; From e5d33f6d34e4cee9f4fef695e66eacb9376c857c Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sat, 16 May 2020 20:15:40 +0100 Subject: [PATCH 2/2] fdkaac: init at 1.0.0 --- pkgs/applications/audio/fdkaac/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/audio/fdkaac/default.nix diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix new file mode 100644 index 00000000000..55c0d7c597c --- /dev/null +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -0,0 +1,31 @@ +{ stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: + +stdenv.mkDerivation rec { + pname = "fdkaac"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nu774"; + repo = pname; + rev = version; + sha256 = "16iwqmwagnb929byz8kj79pmmr0anbyv26drbavhppmxhk7rrpgh"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ fdk_aac ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Command line encoder frontend for libfdk-aac encder"; + longDescription = '' + fdkaac reads linear PCM audio in either WAV, raw PCM, or CAF format, + and encodes it into either M4A / AAC file. + ''; + homepage = "https://github.com/nu774/fdkaac"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = [ maintainers.lunik1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682..c7fff8c8ab4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3453,6 +3453,8 @@ in fdk_aac = callPackage ../development/libraries/fdk-aac { }; + fdk-aac-encoder = callPackage ../applications/audio/fdkaac { }; + feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; fbv = callPackage ../tools/graphics/fbv { };