From 86b995dcce534363ef56ae4335e402f77740ae24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 17:11:03 +0200 Subject: [PATCH] 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. --- gnu/packages/qt.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index afc4d8dc06..e5fc40b351 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel ;;; Copyright © 2018 Eric Bavier +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ (define-module (gnu packages qt) #: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 @@ (define-public qt-4 (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"))))