From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hartmut Goebel Subject: [PATCH 2/3] gnu: python-pyqt-5.5: Use non-inherited "configure" phase. Date: Mon, 5 Dec 2016 10:12:57 +0100 Message-ID: <1480929178-6383-3-git-send-email-h.goebel@crazy-compilers.com> References: <1480929178-6383-1-git-send-email-h.goebel@crazy-compilers.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDpKc-0002N0-5O for guix-devel@gnu.org; Mon, 05 Dec 2016 04:13:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cDpKb-0002A7-Al for guix-devel@gnu.org; Mon, 05 Dec 2016 04:13:06 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:51641) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cDpKb-00029T-0C for guix-devel@gnu.org; Mon, 05 Dec 2016 04:13:05 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3tXJvN0wzPz3hjjw for ; Mon, 5 Dec 2016 10:13:04 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3tXJvN0p9rzw3MX for ; Mon, 5 Dec 2016 10:13:04 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id mJOdtPPek224 for ; Mon, 5 Dec 2016 10:13:02 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-154-106.dynamic.mnet-online.de [188.174.154.106]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Mon, 5 Dec 2016 10:13:02 +0100 (CET) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 807D261364 for ; Mon, 5 Dec 2016 10:12:58 +0100 (CET) In-Reply-To: <1480929178-6383-1-git-send-email-h.goebel@crazy-compilers.com> In-Reply-To: <1480698614-20481-1-git-send-email-h.goebel@crazy-compilers.com> References: <1480698614-20481-1-git-send-email-h.goebel@crazy-compilers.com> 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 This allows passing different options for 5.5 than for the main version (which is currently 5.6). * gnu/packages.qt.scm (python-pyqt-5.5, python2-pyqt-5.5)[arguments]: Copy from (python-pyqt)[arguments]. --- gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fc4700e..aaa7e1c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1054,6 +1054,36 @@ contain over 620 classes.") (base32 "056qmkv02wdcfblqdaxiswrgn4wa88sz22i1x58dpb1iniavplfd")) (patches (search-patches "pyqt-configure.patch")))) + (arguments + `(#:modules ((srfi srfi-1) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (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 (assoc-ref inputs "python")) + (python-version + (last (string-split python #\-))) + (python-major+minor + (string-join + (take (string-split python-version #\.) 2) + ".")) + (lib (string-append out "/lib/python" + python-major+minor + "/site-packages"))) + (zero? (system* "python" "configure.py" + "--confirm-license" + "--bindir" bin + "--destdir" lib + "--designer-plugindir" designer + "--qml-plugindir" qml + "--sipdir" sip)))))))) (native-inputs `(("python-sip" ,python-sip) ("qt" ,qt))))) -- 2.7.4