~ruther/guix-local: gnu: python-qscintilla: Fix build.

e33bd480745e5a352a892252791781044cb7f21b — Sharlatan Hellseher 5 months ago 14e834c

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

patch browse .tar.gz

1 files changed, 13 insertions(+), 11 deletions(-)

M gnu/packages/qt.scm

M gnu/packages/qt.scm => gnu/packages/qt.scm +13 -11

@@ 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