summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-01-31 08:41:02 -0500
committerMark H Weaver <mhw@netris.org>2015-01-31 08:52:49 -0500
commit13b284d91ed05400f7d6cc77a23a767d2c2e9a3c (patch)
tree5a29dab3ff697df55df672bba6a5e1843870e4de
parent20e416453c0a81aa6642eed5acbd55052a9cbb40 (diff)
downloadguix-13b284d91ed05400f7d6cc77a23a767d2c2e9a3c.tar.gz
gnu: icecat: Use system libvpx, icu4c, and pixman libraries.
* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add libvpx, icu4c, pixman.
  [arguments]: Add --with-system-libvpx, --with-system-icu, and
  --enable-system-pixman configure flags.  Add comments about why we
  cannot (yet) add system cairo and sqlite, etc.
-rw-r--r--gnu/packages/gnuzilla.scm22
1 files changed, 22 insertions, 0 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 5e54a2d921..a1a0bf040d 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -42,6 +42,9 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages yasm)
+  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages zip))
 
 (define-public mozjs
@@ -238,6 +241,9 @@ standards.")
        ("libevent" ,libevent)
        ("libxt" ,libxt)
        ("libffi" ,libffi)
+       ("libvpx" ,libvpx)
+       ("icu4c" ,icu4c)
+       ("pixman" ,pixman)
        ("pulseaudio" ,pulseaudio)
        ("mesa" ,mesa)
        ("unzip" ,unzip)
@@ -264,6 +270,22 @@ standards.")
                            "--with-system-zlib"
                            "--with-system-bz2"    ; FIXME: not used
                            "--with-system-libevent"
+                           "--with-system-libvpx"
+                           "--with-system-icu"
+                           "--enable-system-pixman"
+
+                           ;; XXX unsure whether to use these.
+                           ;; "--with-system-nspr"
+                           ;; "--with-system-nss"
+
+                           ;; Fails with "configure: error: Library requirements
+                           ;; (cairo-tee >= 1.10) not met".
+                           ;; "--enable-system-cairo"
+
+                           ;; Fails with "configure: error: System
+                           ;; SQLite library is not compiled with
+                           ;; SQLITE_SECURE_DELETE."
+                           ;; "--enable-system-sqlite"
 
                            ;; Fails with "--with-system-png won't work because
                            ;; the system's libpng doesn't have APNG support".