diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-17 16:47:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-17 16:47:12 -0400 |
| commit | dcaf70897a0bad38a4638a2905aaa3c46b1f1402 (patch) | |
| tree | 439c42bf27972a628ebc0fef11a63b9130ca19a5 /gnu/packages/image.scm | |
| parent | bf62b8ff79f9d60136996b8251b6475965cf4994 (diff) | |
| parent | 040b6299d505c034b4960c335434a500ae2f8187 (diff) | |
| download | guix-dcaf70897a0bad38a4638a2905aaa3c46b1f1402.tar guix-dcaf70897a0bad38a4638a2905aaa3c46b1f1402.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 7f4327badc..4b05cca3b4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -570,18 +570,19 @@ supplies a generic doubly-linked list and some string functions.") (sha256 (base32 "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v")) - (patches (search-patches "freeimage-CVE-2015-0852.patch")))) + (patches (search-patches "freeimage-CVE-2015-0852.patch" + "freeimage-CVE-2016-5684.patch")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-delete - 'configure - (alist-cons-before - 'build 'patch-makefile - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile.gnu" - (("/usr") (assoc-ref outputs "out")) - (("-o root -g root") ""))) - %standard-phases)) + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.gnu" + (("/usr") (assoc-ref outputs "out")) + (("-o root -g root") "")) + #t))) #:make-flags '("CC=gcc") #:tests? #f)) ; no check target (native-inputs |