From e33bd480745e5a352a892252791781044cb7f21b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 24 Nov 2025 12:46:13 +0000 Subject: [PATCH] gnu: python-qscintilla: Fix build. * gnu/packages/qt.scm (python-qscintilla): Use G-Expressions everywhere. [arguments] : Move from here ... : 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 1ce099cb47f1045e389d959795f25833e5b99a6f..6bda060d73836c09a6eef9dde4fc23c0ea0f5e7c 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