2013-10-04 19:10:29 +02:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2015-01-24 20:17:33 +01:00
|
|
|
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
2015-01-03 07:12:01 +01:00
|
|
|
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
2015-04-15 18:13:38 +02:00
|
|
|
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
2013-10-04 19:10:29 +02:00
|
|
|
;;;
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
;;; your option) any later version.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
;;;
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
(define-module (gnu packages qt)
|
2015-02-16 21:15:24 +01:00
|
|
|
#:use-module ((guix licenses) #:select (gpl2 gpl3 lgpl2.1 x11-style))
|
2013-10-04 19:10:29 +02:00
|
|
|
#:use-module (guix packages)
|
|
|
|
#:use-module (guix download)
|
2013-12-14 23:16:46 +01:00
|
|
|
#:use-module (guix build utils)
|
2013-10-04 19:10:29 +02:00
|
|
|
#:use-module (guix build-system gnu)
|
2015-01-24 20:17:33 +01:00
|
|
|
#:use-module (guix packages)
|
|
|
|
#:use-module (guix utils)
|
2013-10-12 14:48:52 +02:00
|
|
|
#:use-module (gnu packages)
|
2013-10-08 20:49:58 +02:00
|
|
|
#:use-module (gnu packages bison)
|
|
|
|
#:use-module (gnu packages compression)
|
2015-06-16 17:27:10 +02:00
|
|
|
#:use-module (gnu packages cups)
|
|
|
|
#:use-module (gnu packages databases)
|
2013-10-08 20:49:58 +02:00
|
|
|
#:use-module (gnu packages fontutils)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
#:use-module (gnu packages flex)
|
2014-11-21 23:46:01 +01:00
|
|
|
#:use-module (gnu packages gl)
|
2013-10-08 20:49:58 +02:00
|
|
|
#:use-module (gnu packages glib)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
#:use-module (gnu packages gnuzilla)
|
|
|
|
#:use-module (gnu packages gperf)
|
2013-10-08 20:49:58 +02:00
|
|
|
#:use-module (gnu packages icu4c)
|
gnu: Consolidate libjpeg, libpng, and libtiff into one module.
* gnu/packages/image.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add image.scm and remove libjpeg.scm,
libpng.scm, and libtiff.scm.
* gnu/packages/libjpeg.scm, gnu/packages/libpng.scm, gnu/packages/libtiff.scm:
Delete files.
* gnu/packages/emacs.scm gnu/packages/games.scm, gnu/packages/gd.scm,
gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/gimp.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnustep.scm, gnu/packages/gnuzilla.scm,
gnu/packages/graphviz.scm, gnu/packages/gtk.scm,
gnu/packages/imagemagick.scm, gnu/packages/inkscape.scm,
gnu/packages/netpbm.scm, gnu/packages/pdf.scm, gnu/packages/plotutils.scm,
gnu/packages/qemu.scm, gnu/packages/qt.scm, gnu/packages/scheme.scm,
gnu/packages/sdl.scm, gnu/packages/slim.scm, gnu/packages/tcl.scm,
gnu/packages/texlive.scm, gnu/packages/video.scm, gnu/packages/xiph.scm,
gnu/packages/xorg.scm: Use (gnu packages image) module.
2014-06-25 14:39:02 +02:00
|
|
|
#:use-module (gnu packages image)
|
2013-10-08 20:49:58 +02:00
|
|
|
#:use-module (gnu packages linux)
|
gnu: Consolidate databases in (gnu packages databases).
* gnu/packages/databases.scm: New file, with the contents of the
following deleted files.
* gnu/packages/mysql.scm, gnu/packages/postgresql.scm,
gnu/packages/recutils.scm, gnu/packages/sqlite.scm,
gnu/packages/bdb.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/packages/apl.scm, gnu/packages/dc.scm, gnu/packages/games.scm,
gnu/packages/gnunet.scm, gnu/packages/linux.scm, gnu/packages/mail.scm,
gnu/packages/mpd.scm, gnu/packages/nvi.scm, gnu/packages/openldap.scm,
gnu/packages/package-management.scm, gnu/packages/python.scm,
gnu/packages/qt.scm, gnu/packages/rdf.scm,
gnu/packages/version-control.scm: Adjust to new module name.
2014-09-08 17:48:03 +02:00
|
|
|
#:use-module (gnu packages databases)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
#:use-module (gnu packages ninja)
|
|
|
|
#:use-module (gnu packages pciutils)
|
|
|
|
#:use-module (gnu packages pcre)
|
2013-10-08 20:49:58 +02:00
|
|
|
#:use-module (gnu packages perl)
|
|
|
|
#:use-module (gnu packages pkg-config)
|
2013-10-10 14:24:51 +02:00
|
|
|
#:use-module (gnu packages pulseaudio)
|
2013-10-08 20:49:58 +02:00
|
|
|
#:use-module (gnu packages python)
|
2014-11-21 23:46:01 +01:00
|
|
|
#:use-module (gnu packages ruby)
|
gnu: Move content of openssl module into tls module.
* gnu/packages/openssl.scm (openssl, perl-net-ssleay): Move to...
* gnu/packages/tls.scm: ...here.
* gnu/packages/openssl.scm: Delete file.
* gnu-system.am (GNU_SYSTEM_MODULES): Unregister deleted file.
* gnu/packages/{admin.scm, bittorrent.scm, certs.scm, ci.scm,
cyrus-sasl.scm, databases.scm, dns.scm, ebook.scm, enlightenment.scm,
gnunet.scm, libreoffice.scm, links.scm, mail.scm, messaging.scm,
networking.scm, ntp.scm, openldap.scm, package-management.scm, pdf.scm,
python.scm, qt.scm, rdesktop.scm, rdf.scm, ruby.scm, ssh.scm,
synergy.scm, tor.scm, version-control.scm, video.scm, vpn.scm,
w3m.scm, web.scm, weechat.scm, xiph.scm}: Adapt module import.
2015-07-05 18:27:24 +02:00
|
|
|
#:use-module (gnu packages tls)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
#:use-module (gnu packages xdisorg)
|
|
|
|
#:use-module (gnu packages xorg)
|
|
|
|
#:use-module (gnu packages xml))
|
2013-10-04 19:10:29 +02:00
|
|
|
|
|
|
|
(define-public libxkbcommon
|
|
|
|
(package
|
|
|
|
(name "libxkbcommon")
|
2014-11-20 23:52:48 +01:00
|
|
|
(version "0.5.0")
|
2013-10-04 19:10:29 +02:00
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "http://xkbcommon.org/download/" name "-"
|
|
|
|
version ".tar.xz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
2014-11-20 23:52:48 +01:00
|
|
|
"176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
|
2013-10-04 19:10:29 +02:00
|
|
|
(build-system gnu-build-system)
|
2014-11-20 23:52:48 +01:00
|
|
|
(inputs
|
2014-11-22 00:14:09 +01:00
|
|
|
`(("libx11" ,libx11)
|
|
|
|
("libxcb" ,libxcb)
|
|
|
|
("xkeyboard-config" ,xkeyboard-config)))
|
gnu: Move numerous "inputs" which should be "native-inputs".
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
gnu/packages/texlive.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
gnu/packages/zip.scm: Move some build-time dependencies from `inputs' to
`native-inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-15 12:01:56 +01:00
|
|
|
(native-inputs
|
2014-11-20 23:52:48 +01:00
|
|
|
`(("bison" ,bison)
|
|
|
|
("pkg-config" ,pkg-config)))
|
2014-11-22 00:14:09 +01:00
|
|
|
(arguments
|
|
|
|
`(#:configure-flags
|
|
|
|
(list (string-append "--with-xkb-config-root="
|
|
|
|
(assoc-ref %build-inputs "xkeyboard-config")
|
|
|
|
"/share/X11/xkb")
|
|
|
|
(string-append "--with-x-locale-root="
|
|
|
|
(assoc-ref %build-inputs "libx11")
|
|
|
|
"/share/X11/locale"))))
|
2013-10-04 19:10:29 +02:00
|
|
|
(home-page "http://xkbcommon.org/")
|
gnu: Some cleanup based on lint checkers.
* gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm,
gnu/packages/apr.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm,
gnu/packages/base.scm, gnu/packages/calcurse.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/compression.scm, gnu/packages/cook.scm,
gnu/packages/crypto.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm,
gnu/packages/doxygen.scm, gnu/packages/dwm.scm, gnu/packages/elf.scm,
gnu/packages/emacs.scm, gnu/packages/feh.scm, gnu/packages/file.scm,
gnu/packages/fish.scm, gnu/packages/flex.scm, gnu/packages/fltk.scm,
gnu/packages/fontutils.scm, gnu/packages/games.scm, gnu/packages/gcal.scm,
gnu/packages/gcc.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gperf.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm,
gnu/packages/hurd.scm, gnu/packages/icu4c.scm, gnu/packages/image.scm,
gnu/packages/imagemagick.scm, gnu/packages/irssi.scm, gnu/packages/kde.scm,
gnu/packages/libdaemon.scm, gnu/packages/libevent.scm,
gnu/packages/libidn.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm,
gnu/packages/lout.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm,
gnu/packages/lua.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm,
gnu/packages/mp3.scm, gnu/packages/netpbm.scm, gnu/packages/noweb.scm,
gnu/packages/ocaml.scm, gnu/packages/openssl.scm, gnu/packages/pcre.scm,
gnu/packages/pdf.scm, gnu/packages/pkg-config.scm,
gnu/packages/pretty-print.scm, gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/rsync.scm, gnu/packages/scheme.scm, gnu/packages/scrot.scm,
gnu/packages/sdl.scm, gnu/packages/skribilo.scm, gnu/packages/ssh.scm,
gnu/packages/stalonetray.scm, gnu/packages/tcl.scm, gnu/packages/tcsh.scm,
gnu/packages/telephony.scm, gnu/packages/texlive.scm, gnu/packages/tor.scm,
gnu/packages/valgrind.scm, gnu/packages/version-control.scm,
gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/web.scm, gnu/packages/wordnet.scm, gnu/packages/xiph.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/zile.scm,
gnu/packages/zip.scm, gnu/packages/zsh.scm [synopsis, description]: Adjust
according to lint checkers.
* gnu/packages/fltk.scm (fltk)[source]: Wrap long line in uri.
* /gnu/packages/xiph.scm (libogg, libtheora, vorbis-tools)[source]: Same.
2014-10-24 06:46:59 +02:00
|
|
|
(synopsis "Library to handle keyboard descriptions")
|
2013-10-04 19:10:29 +02:00
|
|
|
(description "Xkbcommon is a library to handle keyboard descriptions,
|
|
|
|
including loading them from disk, parsing them and handling their
|
|
|
|
state. It is mainly meant for client toolkits, window systems, and other
|
|
|
|
system applications; currently that includes Wayland, kmscon, GTK+, Qt,
|
|
|
|
Clutter, and more. Despite the name, it is not currently used by anything
|
|
|
|
X11 (yet).")
|
|
|
|
(license (x11-style "file://COPYING"
|
|
|
|
"See 'COPYING' in the distribution."))))
|
2013-10-08 20:49:58 +02:00
|
|
|
|
|
|
|
(define-public qt
|
|
|
|
(package
|
|
|
|
(name "qt")
|
2015-06-14 10:50:55 +02:00
|
|
|
(version "5.4.2")
|
2013-10-08 20:49:58 +02:00
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "http://download.qt-project.org/official_releases/qt/"
|
|
|
|
(string-copy version 0 (string-rindex version #\.))
|
|
|
|
"/" version
|
|
|
|
"/single/qt-everywhere-opensource-src-"
|
2013-12-14 23:16:46 +01:00
|
|
|
version ".tar.xz"))
|
2013-10-08 20:49:58 +02:00
|
|
|
(sha256
|
|
|
|
(base32
|
2015-06-14 10:50:55 +02:00
|
|
|
"09gay5cimfdb0apy60v7z4r4zkl2vjysdppzihpla8dp2c30fvcc"))
|
2015-04-30 23:25:54 +02:00
|
|
|
(patches (list (search-patch "qt5-conflicting-typedefs.patch")
|
|
|
|
(search-patch "qt5-runpath.patch")))
|
2015-01-03 07:12:01 +01:00
|
|
|
(snippet
|
|
|
|
'(begin
|
|
|
|
;; Remove broken symlinks.
|
|
|
|
(delete-file "qtwebengine/src/3rdparty/chromium/third_party/\
|
|
|
|
mesa/src/src/gallium/state_trackers/d3d1x/w32api")
|
|
|
|
(delete-file "qtwebengine/src/3rdparty/chromium/third_party/\
|
|
|
|
webrtc/tools/e2e_quality/audio/perf")))))
|
2013-10-08 20:49:58 +02:00
|
|
|
(build-system gnu-build-system)
|
2013-10-10 20:54:25 +02:00
|
|
|
(propagated-inputs
|
|
|
|
`(("mesa" ,mesa)))
|
2013-10-08 20:49:58 +02:00
|
|
|
(inputs
|
|
|
|
`(("alsa-lib" ,alsa-lib)
|
|
|
|
("dbus" ,dbus)
|
2015-06-16 17:27:10 +02:00
|
|
|
("cups" ,cups)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("expat" ,expat)
|
2013-10-08 20:49:58 +02:00
|
|
|
("fontconfig" ,fontconfig)
|
|
|
|
("freetype" ,freetype)
|
|
|
|
("glib" ,glib)
|
|
|
|
("icu4c" ,icu4c)
|
2013-12-14 23:16:46 +01:00
|
|
|
("libjpeg" ,libjpeg)
|
2015-06-16 17:27:10 +02:00
|
|
|
("libmng" ,libmng)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("libpci" ,pciutils)
|
2013-10-08 20:49:58 +02:00
|
|
|
("libpng" ,libpng)
|
|
|
|
("libx11" ,libx11)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("libxcomposite" ,libxcomposite)
|
|
|
|
("libxcursor" ,libxcursor)
|
|
|
|
("libxfixes" ,libxfixes)
|
2013-10-08 20:49:58 +02:00
|
|
|
("libxi" ,libxi)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("libxinerama" ,libxinerama)
|
2013-10-08 20:49:58 +02:00
|
|
|
("libxkbcommon" ,libxkbcommon)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("libxml2" ,libxml2)
|
|
|
|
("libxrandr" ,libxrandr)
|
2013-10-08 20:49:58 +02:00
|
|
|
("libxrender" ,libxrender)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("libxslt" ,libxslt)
|
|
|
|
("libxtst" ,libxtst)
|
|
|
|
("mtdev" ,mtdev)
|
2013-10-08 20:49:58 +02:00
|
|
|
("mysql" ,mysql)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("nss" ,nss)
|
2013-10-08 20:49:58 +02:00
|
|
|
("openssl" ,openssl)
|
2015-06-16 17:27:10 +02:00
|
|
|
("postgresql" ,postgresql)
|
2013-10-10 14:24:51 +02:00
|
|
|
("pulseaudio" ,pulseaudio)
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
("pcre" ,pcre)
|
|
|
|
("sqlite" ,sqlite)
|
|
|
|
("udev" ,eudev)
|
2015-06-16 17:27:10 +02:00
|
|
|
("unixodbc" ,unixodbc)
|
2013-10-08 20:49:58 +02:00
|
|
|
("xcb-util" ,xcb-util)
|
|
|
|
("xcb-util-image" ,xcb-util-image)
|
|
|
|
("xcb-util-keysyms" ,xcb-util-keysyms)
|
|
|
|
("xcb-util-renderutil" ,xcb-util-renderutil)
|
|
|
|
("xcb-util-wm" ,xcb-util-wm)
|
|
|
|
("zlib" ,zlib)))
|
gnu: Move numerous "inputs" which should be "native-inputs".
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
gnu/packages/texlive.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
gnu/packages/zip.scm: Move some build-time dependencies from `inputs' to
`native-inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-15 12:01:56 +01:00
|
|
|
(native-inputs
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
`(("bison" ,bison)
|
|
|
|
("flex" ,flex)
|
|
|
|
("gperf" ,gperf)
|
|
|
|
("ninja" ,ninja)
|
|
|
|
("perl" ,perl)
|
|
|
|
("pkg-config" ,pkg-config)
|
|
|
|
("python" ,python-2)
|
|
|
|
("ruby" ,ruby)
|
gnu: Move 'which' to (gnu packages base).
* gnu/packages/which.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/base.scm (which): New variable.
* gnu/packages/aspell.scm, gnu/packages/audio.scm,
gnu/packages/autogen.scm, gnu/packages/cdrom.scm,
gnu/packages/compression.scm, gnu/packages/datamash.scm,
gnu/packages/games.scm, gnu/packages/glib.scm,
gnu/packages/gnu-pw-mgr.scm, gnu/packages/gnutls.scm,
gnu/packages/gps.scm, gnu/packages/guile.scm,
gnu/packages/java.scm, gnu/packages/libevent.scm,
gnu/packages/linux.scm, gnu/packages/lisp.scm,
gnu/packages/node.scm, gnu/packages/ntp.scm,
gnu/packages/orpheus.scm, gnu/packages/pciutils.scm,
gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/rsync.scm, gnu/packages/sawfish.scm,
gnu/packages/scheme.scm, gnu/packages/ssh.scm,
gnu/packages/statistics.scm, gnu/packages/texlive.scm,
gnu/packages/wdiff.scm: Adjust accordingly.
2015-03-04 17:21:21 +01:00
|
|
|
("which" ,(@ (gnu packages base) which))))
|
2013-10-08 20:49:58 +02:00
|
|
|
(arguments
|
|
|
|
`(#:phases
|
|
|
|
(alist-replace
|
|
|
|
'configure
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
(let ((out (assoc-ref outputs "out")))
|
|
|
|
(substitute* '("configure" "qtbase/configure")
|
2015-01-03 07:12:01 +01:00
|
|
|
(("/bin/pwd") (which "pwd")))
|
|
|
|
(substitute* "qtbase/src/corelib/global/global.pri"
|
|
|
|
(("/bin/ls") (which "ls")))
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
(substitute* "qtwebengine/src/3rdparty/chromium/build/common.gypi"
|
|
|
|
(("/bin/echo") (which "echo")))
|
|
|
|
(substitute* "qtwebengine/src/3rdparty/chromium/third_party/\
|
|
|
|
WebKit/Source/build/scripts/scripts.gypi"
|
|
|
|
(("/usr/bin/gcc") (which "gcc")))
|
|
|
|
(setenv "NINJA_PATH" (which "ninja"))
|
2013-10-08 20:49:58 +02:00
|
|
|
;; do not pass "--enable-fast-install", which makes the
|
|
|
|
;; configure process fail
|
2013-11-11 19:16:03 +01:00
|
|
|
(zero? (system*
|
|
|
|
"./configure"
|
|
|
|
"-verbose"
|
|
|
|
"-prefix" out
|
|
|
|
"-opensource"
|
|
|
|
"-confirm-license"
|
gnu: qt: Add more inputs.
* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
pcre, sqlite, eudev to 'inputs'.
Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.
2015-01-11 12:51:51 +01:00
|
|
|
"-system-sqlite"
|
|
|
|
;; explicitly link with openssl instead of dlopening it
|
|
|
|
"-openssl-linked"
|
2014-11-04 15:41:20 +01:00
|
|
|
;; explicitly link with dbus instead of dlopening it
|
|
|
|
"-dbus-linked"
|
2013-11-11 19:16:03 +01:00
|
|
|
;; drop special machine instructions not supported
|
|
|
|
;; on all instances of the target
|
|
|
|
,@(if (string-prefix? "x86_64"
|
|
|
|
(or (%current-target-system)
|
|
|
|
(%current-system)))
|
|
|
|
'()
|
|
|
|
'("-no-sse2"))
|
|
|
|
"-no-sse3"
|
|
|
|
"-no-ssse3"
|
|
|
|
"-no-sse4.1"
|
|
|
|
"-no-sse4.2"
|
|
|
|
"-no-avx"
|
|
|
|
"-no-avx2"
|
|
|
|
"-no-mips_dsp"
|
|
|
|
"-no-mips_dspr2"))))
|
2013-10-08 20:49:58 +02:00
|
|
|
%standard-phases)))
|
|
|
|
(home-page "http://qt-project.org/")
|
|
|
|
(synopsis "Cross-platform GUI library")
|
|
|
|
(description "Qt is a cross-platform application and UI framework for
|
|
|
|
developers using C++ or QML, a CSS & JavaScript like language.")
|
2014-10-28 01:14:34 +01:00
|
|
|
(license lgpl2.1)
|
|
|
|
|
|
|
|
;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS;
|
|
|
|
;; see <http://hydra.gnu.org/build/112828>.
|
|
|
|
;; Qt 5: assembler error; see <http://hydra.gnu.org/build/112526>.
|
|
|
|
(supported-systems (delete "mips64el-linux" %supported-systems))))
|
2013-10-12 14:48:52 +02:00
|
|
|
|
|
|
|
(define-public qt-4
|
|
|
|
(package (inherit qt)
|
2015-06-14 08:40:07 +02:00
|
|
|
(version "4.8.7")
|
2013-10-12 14:48:52 +02:00
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "http://download.qt-project.org/official_releases/qt/"
|
|
|
|
(string-copy version 0 (string-rindex version #\.))
|
|
|
|
"/" version
|
2013-10-23 23:32:24 +02:00
|
|
|
"/qt-everywhere-opensource-src-"
|
2013-10-12 14:48:52 +02:00
|
|
|
version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
2015-06-14 08:40:07 +02:00
|
|
|
"183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"))
|
2015-04-15 13:30:25 +02:00
|
|
|
(patches (map search-patch
|
|
|
|
'("qt4-ldflags.patch" "qt4-tests.patch")))))
|
2013-12-14 23:16:46 +01:00
|
|
|
(inputs `(,@(alist-delete "libjpeg" (package-inputs qt))
|
2014-05-14 14:30:28 +02:00
|
|
|
("libjepg" ,libjpeg-8)
|
|
|
|
("libsm" ,libsm)))
|
2015-04-15 18:13:38 +02:00
|
|
|
|
|
|
|
;; Note: there are 37 MiB of examples and a '-exampledir' configure flags,
|
|
|
|
;; but we can't make them a separate output because "out" and "examples"
|
|
|
|
;; would refer to each other.
|
|
|
|
(outputs '("out" ;112MiB core + 37MiB examples
|
|
|
|
"doc")) ;280MiB of HTML + code
|
2013-10-12 14:48:52 +02:00
|
|
|
(arguments
|
|
|
|
`(#:phases
|
2015-06-27 10:17:27 +02:00
|
|
|
(modify-phases %standard-phases
|
|
|
|
(replace
|
2013-10-12 14:48:52 +02:00
|
|
|
'configure
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
2015-04-15 18:13:38 +02:00
|
|
|
(let ((out (assoc-ref outputs "out"))
|
|
|
|
(doc (assoc-ref outputs "doc")))
|
2013-10-12 14:48:52 +02:00
|
|
|
(substitute* '("configure")
|
2015-04-15 13:30:25 +02:00
|
|
|
(("/bin/pwd") (which "pwd")))
|
|
|
|
|
2013-11-11 19:16:03 +01:00
|
|
|
(zero? (system*
|
|
|
|
"./configure"
|
|
|
|
"-verbose"
|
|
|
|
"-prefix" out
|
2015-06-27 21:37:50 +02:00
|
|
|
;; Note: Don't pass '-docdir' since 'qmake' and
|
|
|
|
;; libQtCore would record its value, thereby defeating
|
|
|
|
;; the whole point of having a separate output.
|
2015-06-27 19:30:05 +02:00
|
|
|
"-datadir" (string-append out "/share/qt-" ,version
|
|
|
|
"/data")
|
|
|
|
"-importdir" (string-append out "/lib/qt-4"
|
|
|
|
"/imports")
|
|
|
|
"-plugindir" (string-append out "/lib/qt-4"
|
|
|
|
"/plugins")
|
|
|
|
"-translationdir" (string-append out "/share/qt-" ,version
|
|
|
|
"/translations")
|
2015-04-15 18:13:38 +02:00
|
|
|
"-demosdir" (string-append out "/share/qt-" ,version
|
|
|
|
"/demos")
|
|
|
|
"-examplesdir" (string-append out "/share/qt-" ,version
|
|
|
|
"/examples")
|
2013-11-11 19:16:03 +01:00
|
|
|
"-opensource"
|
|
|
|
"-confirm-license"
|
2014-11-04 15:41:20 +01:00
|
|
|
;; explicitly link with dbus instead of dlopening it
|
|
|
|
"-dbus-linked"
|
2013-11-11 19:16:03 +01:00
|
|
|
;; drop special machine instructions not supported
|
|
|
|
;; on all instances of the target
|
|
|
|
,@(if (string-prefix? "x86_64"
|
|
|
|
(or (%current-target-system)
|
|
|
|
(%current-system)))
|
|
|
|
'()
|
|
|
|
'("-no-mmx"
|
2013-10-12 14:48:52 +02:00
|
|
|
"-no-3dnow"
|
|
|
|
"-no-sse"
|
2013-11-11 19:16:03 +01:00
|
|
|
"-no-sse2"))
|
|
|
|
"-no-sse3"
|
|
|
|
"-no-ssse3"
|
|
|
|
"-no-sse4.1"
|
|
|
|
"-no-sse4.2"
|
2015-07-10 20:52:45 +02:00
|
|
|
"-no-avx")))))
|
2015-06-27 21:37:50 +02:00
|
|
|
(add-after
|
|
|
|
'install 'move-doc
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
;; Because of qt4-documentation-path.patch, documentation ends up
|
|
|
|
;; being installed in OUT. Move it to the right place.
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(doc (assoc-ref outputs "doc"))
|
|
|
|
(olddoc (string-append out "/doc"))
|
|
|
|
(docdir (string-append doc "/share/doc/qt-" ,version)))
|
|
|
|
(mkdir-p (dirname docdir))
|
|
|
|
|
|
|
|
;; Note: We can't use 'rename-file' here because OUT and DOC are
|
|
|
|
;; different "devices" due to bind-mounts.
|
|
|
|
(copy-recursively olddoc docdir)
|
|
|
|
(delete-file-recursively olddoc)
|
|
|
|
#t))))))))
|
2015-01-24 20:17:33 +01:00
|
|
|
|
|
|
|
(define-public python-sip
|
|
|
|
(package
|
|
|
|
(name "python-sip")
|
|
|
|
(version "4.16.5")
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri
|
|
|
|
(string-append "mirror://sourceforge/pyqt/sip/"
|
|
|
|
"sip-" version "/sip-"
|
|
|
|
version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"11qy1z88py2q7rz68rm7214pbd37538hpcbfj5hhzp5y616a62x0"))))
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(native-inputs
|
|
|
|
`(("python" ,python-wrapper)))
|
|
|
|
(arguments
|
|
|
|
`(#:tests? #f ; no check target
|
|
|
|
#:phases
|
|
|
|
(alist-replace
|
|
|
|
'configure
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(bin (string-append out "/bin"))
|
|
|
|
(include (string-append out "/include"))
|
|
|
|
(python-version
|
|
|
|
(string-take
|
|
|
|
(string-take-right (assoc-ref inputs "python") 5)
|
|
|
|
3))
|
|
|
|
(lib (string-append out "/lib/python"
|
|
|
|
python-version
|
|
|
|
"/site-packages")))
|
|
|
|
(zero?
|
|
|
|
(system* "python" "configure.py"
|
|
|
|
"--bindir" bin
|
|
|
|
"--destdir" lib
|
|
|
|
"--incdir" include))))
|
|
|
|
%standard-phases)))
|
|
|
|
(home-page "http://www.riverbankcomputing.com/software/sip/intro")
|
|
|
|
(synopsis "Python binding creator for C and C++ libraries")
|
|
|
|
(description
|
|
|
|
"SIP is a tool to create Python bindings for C and C++ libraries. It
|
|
|
|
was originally developed to create PyQt, the Python bindings for the Qt
|
|
|
|
toolkit, but can be used to create bindings for any C or C++ library.
|
|
|
|
|
|
|
|
SIP comprises a code generator and a Python module. The code generator
|
|
|
|
processes a set of specification files and generates C or C++ code, which
|
|
|
|
is then compiled to create the bindings extension module. The SIP Python
|
|
|
|
module provides support functions to the automatically generated code.")
|
|
|
|
;; There is a choice between a python like license, gpl2 and gpl3.
|
|
|
|
;; For compatibility with pyqt, we need gpl3.
|
|
|
|
(license gpl3)))
|
|
|
|
|
|
|
|
(define-public python2-sip
|
|
|
|
(package (inherit python-sip)
|
|
|
|
(name "python2-sip")
|
|
|
|
(native-inputs
|
|
|
|
`(("python" ,python-2)))))
|
2015-01-25 20:07:08 +01:00
|
|
|
|
|
|
|
(define-public python-pyqt
|
|
|
|
(package
|
|
|
|
(name "python-pyqt")
|
|
|
|
(version "5.4")
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri
|
|
|
|
(string-append "mirror://sourceforge/pyqt/PyQt5/"
|
|
|
|
"PyQt-" version "/PyQt-gpl-"
|
|
|
|
version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"0cbpa63whi8a5akff4pcnfwzpzx7ycac2ynj00ly52m6zbsn80kn"))
|
|
|
|
(patches (list (search-patch "pyqt-configure.patch")))))
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
(native-inputs
|
|
|
|
`(("python-sip" ,python-sip)
|
|
|
|
("qt" ,qt))) ; for qmake
|
|
|
|
(inputs
|
|
|
|
`(("python" ,python-wrapper)))
|
|
|
|
(arguments
|
|
|
|
`(#:phases
|
|
|
|
(alist-replace
|
|
|
|
'configure
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(bin (string-append out "/bin"))
|
|
|
|
(sip (string-append out "/share/sip"))
|
|
|
|
(plugins (string-append out "/plugins"))
|
|
|
|
(designer (string-append plugins "/designer"))
|
|
|
|
(qml (string-append plugins "/PyQt5"))
|
|
|
|
(python-version
|
|
|
|
(string-take
|
|
|
|
(string-take-right (assoc-ref inputs "python") 5)
|
|
|
|
3))
|
|
|
|
(lib (string-append out "/lib/python"
|
|
|
|
python-version
|
|
|
|
"/site-packages")))
|
|
|
|
(zero? (system* "python" "configure.py"
|
|
|
|
"--confirm-license"
|
|
|
|
"--bindir" bin
|
|
|
|
"--destdir" lib
|
|
|
|
"--designer-plugindir" designer
|
|
|
|
"--qml-plugindir" qml
|
|
|
|
"--sipdir" sip))))
|
|
|
|
%standard-phases)))
|
|
|
|
(home-page "http://www.riverbankcomputing.com/software/pyqt/intro")
|
|
|
|
(synopsis "Python bindings for Qt")
|
|
|
|
(description
|
|
|
|
"PyQt is a set of Python v2 and v3 bindings for the Qt application
|
|
|
|
framework. The bindings are implemented as a set of Python modules and
|
|
|
|
contain over 620 classes.")
|
|
|
|
(license gpl3)))
|
|
|
|
|
|
|
|
(define-public python2-pyqt
|
|
|
|
(package (inherit python-pyqt)
|
|
|
|
(name "python2-pyqt")
|
|
|
|
(native-inputs
|
|
|
|
`(("python-sip" ,python2-sip)
|
|
|
|
("qt" ,qt)))
|
|
|
|
(inputs
|
|
|
|
`(("python" ,python-2)))))
|
2015-02-16 21:15:24 +01:00
|
|
|
|
|
|
|
(define-public python-pyqt-4
|
|
|
|
(package (inherit python-pyqt)
|
|
|
|
(name "python-pyqt")
|
|
|
|
(version "4.11.3")
|
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri
|
|
|
|
(string-append "mirror://sourceforge/pyqt/PyQt4/"
|
|
|
|
"PyQt-" version "/PyQt-x11-gpl-"
|
|
|
|
version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"11jnfjw79s0b0qdd9s6kd69w87vf16dhagbhbmwbmrp2vgf80dw5"))))
|
|
|
|
(native-inputs
|
|
|
|
`(("python-sip" ,python-sip)
|
|
|
|
("qt" ,qt-4)))
|
|
|
|
(arguments
|
|
|
|
`(#:tests? #f ; no check target
|
|
|
|
#:phases
|
|
|
|
(alist-replace
|
|
|
|
'configure
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(bin (string-append out "/bin"))
|
|
|
|
(sip (string-append out "/share/sip"))
|
|
|
|
(python-version
|
|
|
|
(string-take
|
|
|
|
(string-take-right (assoc-ref inputs "python") 5)
|
|
|
|
3))
|
|
|
|
(lib (string-append out "/lib/python"
|
|
|
|
python-version
|
|
|
|
"/site-packages")))
|
|
|
|
(zero? (system* "python" "configure.py"
|
|
|
|
"--confirm-license"
|
|
|
|
"--bindir" bin
|
|
|
|
"--destdir" lib
|
|
|
|
"--sipdir" sip))))
|
|
|
|
%standard-phases)))
|
|
|
|
(license (list gpl2 gpl3)))) ; choice of either license
|
|
|
|
|
|
|
|
(define-public python2-pyqt-4
|
|
|
|
(package (inherit python-pyqt-4)
|
|
|
|
(name "python2-pyqt")
|
|
|
|
(native-inputs
|
|
|
|
`(("python-sip" ,python2-sip)
|
|
|
|
("qt" ,qt-4)))
|
|
|
|
(inputs
|
|
|
|
`(("python" ,python-2)))))
|