summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-07-31 21:53:47 +0300
committerEfraim Flashner <efraim@flashner.co.il>2018-07-31 23:12:50 +0300
commit64ed4b6a271637bfbda464033590c1d2a5c33c3e (patch)
tree32a79f33b1be891dc6f740efb3b6064beddb2476
parent52404022cf36db077c909bde9e739c9de5a662f9 (diff)
downloadguix-64ed4b6a271637bfbda464033590c1d2a5c33c3e.tar.gz
gnu: optipng: Use system libraries.
* gnu/packages/image.scm (optipng)[source]: Add snippet to delete
bundled libraries.
[inputs]: Add libpng.
[arguments]: Add configure-flag to use system libraries.
-rw-r--r--gnu/packages/image.scm14
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