nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Qt@4: Build with GCC 5 and OpenSSL 1.0. 

* gnu/packages/qt.scm (qt-4)[inputs]: Replace OPENSSL with OPENSSL-1.0.
[native-inputs]: Add GCC-5.
This commit is contained in:
Marius Bakke 2019-07-16 17:11:03 +02:00
parent d619686250
commit 86b995dcce
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/qt.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -46,6 +47,7 @@
#:use-module (gnu packages fontutils)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gperf)
@ -423,11 +425,16 @@ system, and the core design of Django is reused in Grantlee.")
(inputs
`(,@(fold alist-delete
(package-inputs qt)
'("harfbuzz" "libjpeg"))
'("harfbuzz" "libjpeg" "openssl"))
("libjpeg" ,libjpeg-8)
("libsm" ,libsm)))
("libsm" ,libsm)
("openssl" ,openssl-1.0)))
(native-inputs
`(,@(fold alist-delete
`(;; XXX: The JavaScriptCore engine does not build with the C++11 standard.
;; We could build it with -std=gnu++98, but then we'll get in trouble with
;; ICU later. Just keep using GCC 5 for now.
("gcc" ,gcc-5)
,@(fold alist-delete
(package-native-inputs qt)
'("vulkan-headers"))))