aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-07-28 16:41:27 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-07-28 17:27:16 +0200
commit71de61c353906d97f189a82ca35970b9202dde19 (patch)
tree1d84c6cce06eb29b7cbefbb017456660686afb19
parent6871121be0f19678b4a04d9dcf0124198a0e5fe6 (diff)
downloadguix-71de61c353906d97f189a82ca35970b9202dde19.tar
guix-71de61c353906d97f189a82ca35970b9202dde19.tar.gz
gnu: libjpeg-turbo: Update license.
* gnu/packages/image.scm (libjpeg-turbo)[license]: Add ZLIB.
-rw-r--r--gnu/packages/image.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index ab1e4df094..b381c3f97b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1248,8 +1248,10 @@ libjpeg-turbo implements both the traditional libjpeg API and the less powerful
but more straightforward TurboJPEG API, and provides a full-featured Java
interface. It supports color space extensions that allow it to compress from
and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).")
- (license (list license:bsd-3 ; jsimd*.[ch] and most of simd/
- license:ijg)))) ; the rest
+ ;; libjpeg-turbo is covered by three different licenses; see LICENSE.md.
+ (license (list license:bsd-3 ;the TurboJPEG API library and programs
+ license:ijg ;the libjpeg library and associated tools
+ license:zlib)))) ;the libjpeg-turbo SIMD extensions
(define-public niftilib
(package