diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/development/libraries/libheif | |
parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libheif')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libheif/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix index d14df84d3483..cdff03fc09ae 100644 --- a/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook +, cmake , pkg-config , dav1d , rav1e @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.15.2"; + version = "1.17.6"; outputs = [ "bin" "out" "dev" "man" ]; @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "sha256-VbMBZ17leGezng2FYKgiSq04Se0PT0a3WqjM6xZ3zS4="; + sha256 = "sha256-pp+PjV/pfExLqzFE61mxliOtVAYOePh1+i1pwZxDLAM="; }; nativeBuildInputs = [ - autoreconfHook pkg-config + cmake ]; buildInputs = [ @@ -49,11 +49,15 @@ stdenv.mkDerivation rec { gdk-pixbuf ]; - enableParallelBuilding = true; - # Fix installation path for gdk-pixbuf module PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}"; + # Wrong include path in .cmake. It's a bit difficult to patch because of special characters. + postFixup = '' + sed '/^ INTERFACE_INCLUDE_DIRECTORIES/s|"[^"]*/include"|"${placeholder "dev"}/include"|' \ + -i "$dev"/lib/cmake/libheif/libheif-config.cmake + ''; + passthru.tests = { inherit gimp imagemagick imlib2Full imv vips; }; |