ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-qscintilla: Fix build.

Browse source 
* gnu/packages/qt.scm (python-qscintilla)[build-system]: Swith to
  pyproject-build-system.
  [arguments]: Update 'configure-flags'. Delete custom 'configure' phase. Add
  'prepare-build' and 'set-include-dirs' phases.
  [native-inputs]: Add python-pyqt-builder and qtbase-5.
  [inputs]: Add python-sip.
This commit is contained in:
Guillaume Le Vaillant 2023-04-17 15:16:56 +02:00
parent 924c871ff6
commit d3c7ca3c40
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gnu/packages/qt.scm
View file

@ -21,7 +21,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021, 2022, 2023 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
@ -3533,40 +3533,35 @@ (define-public qscintilla
(define-public python-qscintilla
(package/inherit qscintilla
(name "python-qscintilla")
(build-system pyproject-build-system)
(arguments
`(#:configure-flags
(list "--pyqt=PyQt5"
(string-append "--pyqt-sipdir="
(assoc-ref %build-inputs "python-pyqt")
"/share/sip")
(string-append "--qsci-incdir="
(assoc-ref %build-inputs "qscintilla")
"/include")
(string-append "--qsci-libdir="
(assoc-ref %build-inputs "qscintilla")
"/lib"))
(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
(replace 'configure
(lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(python (assoc-ref inputs "python")))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-build
(lambda _
(chdir "Python")
(apply invoke "python3" "configure.py"
configure-flags)
;; Install to the right directory
(substitute* '("Makefile"
"Qsci/Makefile")
(("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+") out)
(((string-append python "/lib"))
(string-append out "/lib")))
;; And fix the installed.txt file
(substitute* "installed.txt"
(("/gnu/store/[^/]+") out))))))))
(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"))
(sip-include-dirs (string-append
python-pyqt "/lib/python"
(python-version python)
"/site-packages/PyQt5/bindings")))
(setenv "SIP_INCLUDE_DIRS" sip-include-dirs)))))))
(native-inputs
(list python-pyqt-builder qtbase-5))
(inputs
`(("qscintilla" ,qscintilla)
("python" ,python)
("python-pyqt" ,python-pyqt)))
(list python-pyqt python-sip qscintilla))
(description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
editor control. QScintilla includes features especially useful when editing
and debugging source code. These include support for syntax styling, error