diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-10-04 00:51:21 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-10-04 11:09:14 +0200 |
| commit | 7431edea5b6eb4d1c67ddf9971efdfdbc65fc349 (patch) | |
| tree | 750d96c61af99d69fd446a035ece66d8ef7d554d /gnu/packages/qt.scm | |
| parent | f8822418f1d93e73c3b1431d0d4d1b1f2ea5c213 (diff) | |
| download | guix-7431edea5b6eb4d1c67ddf9971efdfdbc65fc349.tar.gz | |
gnu: qt-4: Disable webkit build.
* gnu/packages/qt.scm (qt-4)[source]: Add snippet to remove the webkit code and drop one patch used previously for webkit. [arguments]: Add configure flag to disable building the webkit module. * gnu/packages/patches/qt4-tests.patch: Delete file. * gnu-system.am (dist_patch_DATA): Unregister patch. Partially fixes <http://bugs.gnu.org/21288>.
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ce5ab656a5..c2c3f9abcd 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -243,7 +243,11 @@ developers using C++ or QML, a CSS & JavaScript like language.") (base32 "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) (patches (map search-patch - '("qt4-ldflags.patch" "qt4-tests.patch"))))) + '("qt4-ldflags.patch"))) + (modules '((guix build utils))) + (snippet + ;; Remove webkit module, which is not built. + '(delete-file-recursively "src/3rdparty/webkit")))) (inputs `(,@(alist-delete "harfbuzz" (alist-delete "libjpeg" (package-inputs qt))) ("libjepg" ,libjpeg-8) @@ -288,6 +292,9 @@ developers using C++ or QML, a CSS & JavaScript like language.") "-confirm-license" ;; explicitly link with dbus instead of dlopening it "-dbus-linked" + ;; Skip the webkit module; it fails to build on armhf + ;; and, apart from that, may pose security risks. + "-no-webkit" ;; drop special machine instructions not supported ;; on all instances of the target ,@(if (string-prefix? "x86_64" |