diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
commit | 6af7c2b178b4d9bf16aced8bbfc1518643425f13 (patch) | |
tree | c71a79116d94659576096362907160d5b82b367d /gnu/packages/image.scm | |
parent | 869250809bddcf8eab26ecdedabad6fc060751dd (diff) | |
parent | e921234d02c926b5a95498aed1280b6346dd0878 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
-rw-r--r-- | gnu/packages/image.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b381c3f97b..b604712c99 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1199,10 +1199,17 @@ installed as @code{stb_image}.") version ".tar.gz")) (sha256 (base32 - "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg")))) + "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/libpng") + (delete-file-recursively "src/zlib") + #t)))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib))) + `(("libpng" ,libpng) + ("zlib" ,zlib))) (arguments '(#:phases (modify-phases %standard-phases @@ -1210,7 +1217,8 @@ installed as @code{stb_image}.") (lambda* (#:key outputs #:allow-other-keys) ;; configure script doesn't accept arguments CONFIG_SHELL and SHELL (invoke "sh" "configure" - (string-append "--prefix=" (assoc-ref outputs "out"))) + (string-append "--prefix=" (assoc-ref outputs "out")) + "-with-system-libs") #t))))) (synopsis "Optimizer that recompresses PNG image files to a smaller size") (description "OptiPNG is a PNG optimizer that recompresses image |