JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #99549 from gebner/libheif191

Browse Source
This commit is contained in:
Gabriel Ebner 2020-10-04 15:59:53 +02:00 committed by GitHub
commit 7a8aa6110d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libde265/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
version = "1.0.6";
version = "1.0.7";
pname = "libde265";
src = fetchFromGitHub {
owner = "strukturag";
repo = "libde265";
rev = "v${version}";
sha256 = "0ipccyavlgf7hfzx1g8bvzg62xq10vcxvwgq70r3z3j6mdvmrzjp";
sha256 = "0x7g9771457z49qvzpk4iswfhq018i0mzsflv9gg8if5hjqhfdp0";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

10
pkgs/development/libraries/libheif/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng,
libjpeg, libaom }:
stdenv.mkDerivation rec {
pname = "libheif";
version = "1.8.0";
version = "1.9.1";
outputs = [ "bin" "out" "dev" "man" ];
@ -10,11 +11,12 @@ stdenv.mkDerivation rec {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
sha256 = "15az44qdqp2vncdfv1bzdl30977kvqxcb2bhx4x3q6vcxnm1xfgg";
sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libde265 x265 libpng libjpeg ];
buildInputs = [ libde265 x265 libpng libjpeg libaom ];
# TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config
enableParallelBuilding = true;