From 36cab2324cd89a46b99cd8f1326829cd75cb90b2 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 9 Dec 2017 11:44:22 +0000 Subject: [PATCH 1/2] mp4v2: enable darwin --- pkgs/development/libraries/mp4v2/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index de8e5f78646..736c31b442a 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "mp4v2-2.0.0"; @@ -18,10 +18,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + meta = { homepage = https://code.google.com/archive/p/mp4v2/; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mpl11; + platforms = lib.platforms.unix; + license = lib.licenses.mpl11; }; } From 0431971eae9301b0175dcde5ef9c2b5f8c4c1578 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 7 Dec 2017 13:52:32 +0100 Subject: [PATCH 2/2] faac: 1.29.3 -> 1.29.9.2 --- pkgs/development/libraries/faac/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 55433786002..51696886148 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -8,11 +8,11 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { name = "faac-${version}"; - version = "1.29.3"; + version = "1.29.9.2"; src = fetchurl { url = "mirror://sourceforge/faac/${name}.tar.gz"; - sha256 = "0gssrz2vq52mj8x2hvdqc9bwkp64s4f4g7yj7ac6dwxs8dw8kwnf"; + sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl"; }; configureFlags = [ ] @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional mp4v2Support mp4v2; + enableParallelBuilding = true; + meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; homepage = http://www.audiocoding.com/faac.html;