guix_mirror_bot pushed a commit to branch master
in repository guix.
commit e33bd480745e5a352a892252791781044cb7f21b
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Mon Nov 24 12:46:13 2025 +0000
gnu: python-qscintilla: Fix build.
* gnu/packages/qt.scm (python-qscintilla): Use G-Expressions everywhere.
[arguments] <configure-flags>: Move from here ...
<phases>: to {set-configure-flags} .. here.
Change-Id: I8974144117f80ea6446977a7bc698e9fb3603996
---
gnu/packages/qt.scm | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1ce099cb47..6bda060d73 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4845,26 +4845,28 @@ indicators, code completion and call tips.")
(build-system pyproject-build-system)
(arguments
(list #:tests? #f
- #:configure-flags
- #~`(@ ("--qsci-include-dir" . ,(string-append
- #$(this-package-input "qscintilla")
- "/include"))
- ("--qsci-library-dir" . ,(string-append
- #$(this-package-input "qscintilla")
- "/lib")))
#:phases
#~(modify-phases %standard-phases
+ (add-before 'build 'set-configure-flags
+ (lambda _
+ (setenv "CFLAGS" (string-append
+ "--qsci-include-dir"
+ #$(this-package-input "qscintilla")
+ "/include"
+ " --qsci-library-dir"
+ #$(this-package-input "qscintilla")
+ "/lib"))))
(add-after 'unpack 'prepare-build
(lambda _
(chdir "Python")
(symlink "pyproject-qt5.toml" "pyproject.toml")))
(add-after 'unpack 'set-include-dirs
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((python (assoc-ref inputs "python"))
- (python-pyqt (assoc-ref inputs "python-pyqt"))
+ (lambda _
+ (let* ((python-pyqt #$(this-package-input "python-pyqt"))
(sip-include-dirs (string-append
python-pyqt "/lib/python"
- (python-version python)
+ #$(version-major+minor
+ (package-version python))
"/site-packages/PyQt5/bindings")))
(setenv "SIP_INCLUDE_DIRS" sip-include-dirs)))))))
(native-inputs
