diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
| commit | 023522d3a1e81fe9bc803183337fdc8c183a88c4 (patch) | |
| tree | ec374744812891a627f33fa457b0bcf083e2c142 /gnu/packages/image.scm | |
| parent | 07abc851ce8a580253061e065b31a4037d2f965d (diff) | |
| parent | 7373eb8304e0ebbfabe66deb59e78187013403dd (diff) | |
| download | guix-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 51b76162ef..ff9fdf4b36 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -973,11 +973,7 @@ supplies a generic doubly-linked list and some string functions.") ;; We need '-fpermissive' for Source/FreeImage.h. ;; libjxr doesn't have a pkg-config file. (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive " - "-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib " - - ;; FIXME: OpenEXR 2.4.0 requires C++11 or later. - ;; Remove when the default compiler is > GCC 5. - "-std=gnu++11")) + "-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib")) #:tests? #f)) ; no check target (native-inputs `(("pkg-config" ,pkg-config) |