mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 21:59:08 -05:00
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'.
This commit is contained in:
parent
5b490ab52f
commit
0009ed71ad
1 changed files with 42 additions and 5 deletions
|
@ -27,19 +27,27 @@ (define-module (gnu packages qt)
|
||||||
#:use-module (gnu packages bison)
|
#:use-module (gnu packages bison)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages fontutils)
|
#:use-module (gnu packages fontutils)
|
||||||
|
#:use-module (gnu packages flex)
|
||||||
#:use-module (gnu packages gl)
|
#:use-module (gnu packages gl)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gnuzilla)
|
||||||
|
#:use-module (gnu packages gperf)
|
||||||
#:use-module (gnu packages icu4c)
|
#:use-module (gnu packages icu4c)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages databases)
|
#:use-module (gnu packages databases)
|
||||||
|
#:use-module (gnu packages ninja)
|
||||||
#:use-module (gnu packages openssl)
|
#:use-module (gnu packages openssl)
|
||||||
|
#:use-module (gnu packages pciutils)
|
||||||
|
#:use-module (gnu packages pcre)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages pulseaudio)
|
#:use-module (gnu packages pulseaudio)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages ruby)
|
#:use-module (gnu packages ruby)
|
||||||
#:use-module (gnu packages xorg))
|
#:use-module (gnu packages xdisorg)
|
||||||
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages xml))
|
||||||
|
|
||||||
(define-public libxkbcommon
|
(define-public libxkbcommon
|
||||||
(package
|
(package
|
||||||
|
@ -106,21 +114,34 @@ (define-public qt
|
||||||
(inputs
|
(inputs
|
||||||
`(("alsa-lib" ,alsa-lib)
|
`(("alsa-lib" ,alsa-lib)
|
||||||
("dbus" ,dbus)
|
("dbus" ,dbus)
|
||||||
|
("expat" ,expat)
|
||||||
("fontconfig" ,fontconfig)
|
("fontconfig" ,fontconfig)
|
||||||
("freetype" ,freetype)
|
("freetype" ,freetype)
|
||||||
("glib" ,glib)
|
("glib" ,glib)
|
||||||
("icu4c" ,icu4c)
|
("icu4c" ,icu4c)
|
||||||
("libjpeg" ,libjpeg)
|
("libjpeg" ,libjpeg)
|
||||||
|
("libpci" ,pciutils)
|
||||||
("libpng" ,libpng)
|
("libpng" ,libpng)
|
||||||
("libx11" ,libx11)
|
("libx11" ,libx11)
|
||||||
|
("libxcomposite" ,libxcomposite)
|
||||||
|
("libxcursor" ,libxcursor)
|
||||||
|
("libxfixes" ,libxfixes)
|
||||||
("libxi" ,libxi)
|
("libxi" ,libxi)
|
||||||
|
("libxinerama" ,libxinerama)
|
||||||
("libxkbcommon" ,libxkbcommon)
|
("libxkbcommon" ,libxkbcommon)
|
||||||
|
("libxml2" ,libxml2)
|
||||||
|
("libxrandr" ,libxrandr)
|
||||||
("libxrender" ,libxrender)
|
("libxrender" ,libxrender)
|
||||||
|
("libxslt" ,libxslt)
|
||||||
|
("libxtst" ,libxtst)
|
||||||
|
("mtdev" ,mtdev)
|
||||||
("mysql" ,mysql)
|
("mysql" ,mysql)
|
||||||
|
("nss" ,nss)
|
||||||
("openssl" ,openssl)
|
("openssl" ,openssl)
|
||||||
("pulseaudio" ,pulseaudio)
|
("pulseaudio" ,pulseaudio)
|
||||||
("python-wrapper" ,python-wrapper)
|
("pcre" ,pcre)
|
||||||
("ruby" ,ruby)
|
("sqlite" ,sqlite)
|
||||||
|
("udev" ,eudev)
|
||||||
("xcb-util" ,xcb-util)
|
("xcb-util" ,xcb-util)
|
||||||
("xcb-util-image" ,xcb-util-image)
|
("xcb-util-image" ,xcb-util-image)
|
||||||
("xcb-util-keysyms" ,xcb-util-keysyms)
|
("xcb-util-keysyms" ,xcb-util-keysyms)
|
||||||
|
@ -128,8 +149,15 @@ (define-public qt
|
||||||
("xcb-util-wm" ,xcb-util-wm)
|
("xcb-util-wm" ,xcb-util-wm)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("perl" ,perl)
|
`(("bison" ,bison)
|
||||||
("pkg-config" ,pkg-config)))
|
("flex" ,flex)
|
||||||
|
("gperf" ,gperf)
|
||||||
|
("ninja" ,ninja)
|
||||||
|
("perl" ,perl)
|
||||||
|
("pkg-config" ,pkg-config)
|
||||||
|
("python" ,python-2)
|
||||||
|
("ruby" ,ruby)
|
||||||
|
("which" ,(@ (gnu packages which) which))))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(alist-replace
|
(alist-replace
|
||||||
|
@ -140,6 +168,12 @@ (define-public qt
|
||||||
(("/bin/pwd") (which "pwd")))
|
(("/bin/pwd") (which "pwd")))
|
||||||
(substitute* "qtbase/src/corelib/global/global.pri"
|
(substitute* "qtbase/src/corelib/global/global.pri"
|
||||||
(("/bin/ls") (which "ls")))
|
(("/bin/ls") (which "ls")))
|
||||||
|
(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"))
|
||||||
;; do not pass "--enable-fast-install", which makes the
|
;; do not pass "--enable-fast-install", which makes the
|
||||||
;; configure process fail
|
;; configure process fail
|
||||||
(zero? (system*
|
(zero? (system*
|
||||||
|
@ -148,6 +182,9 @@ (define-public qt
|
||||||
"-prefix" out
|
"-prefix" out
|
||||||
"-opensource"
|
"-opensource"
|
||||||
"-confirm-license"
|
"-confirm-license"
|
||||||
|
"-system-sqlite"
|
||||||
|
;; explicitly link with openssl instead of dlopening it
|
||||||
|
"-openssl-linked"
|
||||||
;; explicitly link with dbus instead of dlopening it
|
;; explicitly link with dbus instead of dlopening it
|
||||||
"-dbus-linked"
|
"-dbus-linked"
|
||||||
;; drop special machine instructions not supported
|
;; drop special machine instructions not supported
|
||||||
|
|
Loading…
Reference in a new issue