From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: guix-devel@gnu.org
Subject: [PATCH 2/3] gnu: python-pyqt-5.5: Use non-inherited "configure" phase.
Date: Mon, 5 Dec 2016 10:12:57 +0100 [thread overview]
Message-ID: <1480929178-6383-3-git-send-email-h.goebel@crazy-compilers.com> (raw)
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>
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
next prev parent reply other threads:[~2016-12-05 9:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 17:10 [PATCH] gnu: python-pyqt: Fix build by explicitly setting the stubsdir Hartmut Goebel
2016-12-03 16:12 ` Ricardo Wurmus
2016-12-05 8:53 ` Hartmut Goebel
2016-12-05 9:12 ` [PATCH 0/3] Fixes for python-pyqt Hartmut Goebel
2016-12-05 9:12 ` [PATCH 1/3] gnu: python2-pyqt-4: Change package name to python2-pyqt Hartmut Goebel
2016-12-08 21:17 ` Efraim Flashner
2016-12-05 9:12 ` Hartmut Goebel [this message]
2016-12-05 12:44 ` [PATCH 2/3] gnu: python-pyqt-5.5: Use non-inherited "configure" phase Hartmut Goebel
2016-12-08 21:19 ` Efraim Flashner
2016-12-09 12:28 ` Hartmut Goebel
2016-12-09 12:30 ` Efraim Flashner
2016-12-09 12:54 ` Hartmut Goebel
2016-12-05 9:12 ` [PATCH 3/3 v2] gnu: python-pyqt: Fix build by explicitly setting the stubsdir Hartmut Goebel
2016-12-08 21:20 ` Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480929178-6383-3-git-send-email-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).