From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH 1/2] gnu: hplip: Add qt5 gui. Date: Thu, 29 Dec 2016 14:05:52 +0000 Message-ID: <20161229140553.31265-2-ng0@libertad.pw> References: <87shp6sw62.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> <20161229140553.31265-1-ng0@libertad.pw> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMbL4-00055z-IP for guix-devel@gnu.org; Thu, 29 Dec 2016 09:05:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMbL3-00080h-JR for guix-devel@gnu.org; Thu, 29 Dec 2016 09:05:50 -0500 Received: from aibo.runbox.com ([91.220.196.211]:43374) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cMbL3-000808-C2 for guix-devel@gnu.org; Thu, 29 Dec 2016 09:05:49 -0500 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cMbL2-0000G1-7k for guix-devel@gnu.org; Thu, 29 Dec 2016 15:05:48 +0100 In-Reply-To: <20161229140553.31265-1-ng0@libertad.pw> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/cups.scm (hplip): Add gui. [arguments](configure-flags): Add "--enable-gui-build", "--disable-qt4", "--enable-qt5". [inputs]: Add python-pyqt, python-pygobject and python-sip. --- gnu/packages/cups.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index baa77f7aa..d264d6b12 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016 Ludovic Courtès ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +39,8 @@ #:use-module (gnu packages glib) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages tls)) + #:use-module (gnu packages tls) + #:use-module (gnu packages qt)) ;; Delay to avoid module circularity problems. (define ghostscript/cups @@ -346,6 +348,9 @@ device-specific programs to convert and print many types of files.") "--enable-new-hpcups" "--enable-cups_ppd_install" "--enable-cups_drv_install" + "--enable-gui-build" + "--disable-qt4" + "--enable-qt5" ;; TODO add foomatic drv install eventually. ;; TODO --enable-policykit eventually. ,(string-append "--with-cupsfilterdir=" @@ -420,6 +425,9 @@ device-specific programs to convert and print many types of files.") ("dbus" ,dbus) ("python-wrapper" ,python-wrapper) ("python" ,python) + ("python-pyqt" ,python-pyqt) + ("python-pygobject" ,python-pygobject) + ("python-sip" ,python-sip) ;; TODO: Make hp-setup find python-dbus. ("python-dbus" ,python-dbus))) (native-inputs `(("pkg-config" ,pkg-config))))) -- 2.11.0