summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2016-03-28 13:19:18 +0200
committerRicardo Wurmus <rekado@elephly.net>2016-04-26 22:15:25 +0200
commitfc7c74e43d49d73298fe6df992041044f2fc92c2 (patch)
tree869284d4738edd5f342b5aeef350463e19fe9f21
parent272950900362742c3e410a26aa41335281f029c3 (diff)
downloadguix-fc7c74e43d49d73298fe6df992041044f2fc92c2.tar.gz
gnu: wxwidgets: Enable webview support.
* gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Add webkitgtk-2.4.
[arguments]: Add configure flags to enable webview via the webkitgtk
backend.
-rw-r--r--gnu/packages/wxwidgets.scm10
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index b49fb2fe84..2c4a26aeac 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +32,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages sdl)
+  #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg))
 
 (define-public wxwidgets
@@ -45,7 +47,6 @@
        (sha256
         (base32 "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"))))
     (build-system glib-or-gtk-build-system)
-    ;; TODO: add WebKit
     (inputs
      `(("glu" ,glu)
        ;; XXX gstreamer-0.10 builds fail
@@ -56,12 +57,17 @@
        ("libsm" ,libsm)
        ("libtiff" ,libtiff)
        ("mesa" ,mesa)
+       ("webkitgtk" ,webkitgtk-2.4)
        ("sdl" ,sdl)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (arguments
      '(#:configure-flags
-       '("--with-regex=sys" "--with-libmspack" "--with-sdl")
+       '("--with-regex=sys" "--with-libmspack"
+         "--with-sdl"
+         "--enable-webview"
+         "--enable-webkit"
+         "--enable-webviewwebkit")
        #:make-flags
        (list (string-append "LDFLAGS=-Wl,-rpath="
                             (assoc-ref %outputs "out") "/lib"))