diff options
| author | Christian Kauhaus <kc@flyingcircus.io> | 2019-11-24 13:15:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 13:15:02 +0100 |
| commit | f02d65c980a71dcf2814cc302616402dce59c292 (patch) | |
| tree | 7635d28a29306746952a5fb2feb051f9c0f0deae /pkgs/applications/graphics | |
| parent | da8e001b1213dd1b7c1947f397b7b14325b601c5 (diff) | |
| parent | a0d335ff39c4280456b293fb83582d7a0cc6b939 (diff) | |
| download | nixpkgs-f02d65c980a71dcf2814cc302616402dce59c292.tar nixpkgs-f02d65c980a71dcf2814cc302616402dce59c292.tar.gz nixpkgs-f02d65c980a71dcf2814cc302616402dce59c292.tar.bz2 nixpkgs-f02d65c980a71dcf2814cc302616402dce59c292.tar.lz nixpkgs-f02d65c980a71dcf2814cc302616402dce59c292.tar.xz nixpkgs-f02d65c980a71dcf2814cc302616402dce59c292.tar.zst nixpkgs-f02d65c980a71dcf2814cc302616402dce59c292.zip | |
Merge pull request #73586 from c0bw3b/sec/jasper
jasper: mark as vulnerable, replace with openjpeg where possible, disable JPEG2000 support.
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1fc15af7244..1d9b06de29f 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -26,7 +26,7 @@ , exiv2 , ffmpeg , flex -, jasper +, jasper ? null, withJpeg2k ? false # disable JPEG2000 support, jasper has unfixed CVE , lcms2 , lensfun , libgphoto2 @@ -70,7 +70,6 @@ mkDerivation rec { exiv2 ffmpeg flex - jasper lcms2 lensfun libgphoto2 @@ -103,7 +102,8 @@ mkDerivation rec { marble oxygen threadweaver - ]; + ] + ++ lib.optionals withJpeg2k [ jasper ]; enableParallelBuilding = true; |