diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
commit | 16f676d6bbd4f930b0017ccb20cebe5a29e17545 (patch) | |
tree | 0d554b4f16bdef502035b743457fc29ffcc5e7f7 /nixpkgs/pkgs/development/libraries/kde-frameworks | |
parent | e7caacc4c122b7641bb66a4c2595289347a4996c (diff) | |
parent | 3a8d7958a610cd3fec3a6f424480f91a1b259185 (diff) | |
download | nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.gz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.bz2 nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.lz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.xz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.zst nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.zip |
Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 3d9c5851f246..4ad3ba741008 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,15 +1,24 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, - ilmbase, karchive, openexr, qtbase + ilmbase, karchive, openexr, libavif, qtbase }: let inherit (lib) getDev; in mkDerivation { name = "kimageformats"; + + patches = [ + (fetchpatch { # included in kimageformats >= 5.83 + name = "avif-0.9.2.diff"; + url = "https://invent.kde.org/frameworks/kimageformats/-/commit/bf3f94da766d66a0470ab744dbe1ced4697b572d.diff"; + sha256 = "18d67l5kj9sv88jdpi061k9rl3adzkx9l51ng7saylrkfddwc3ig"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive openexr qtbase ]; + buildInputs = [ karchive openexr libavif qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; } |