diff options
| author | Cayetano Santos <csantosb@inventati.org> | 2026-03-01 18:53:48 +0100 |
|---|---|---|
| committer | Cayetano Santos <csantosb@inventati.org> | 2026-03-01 19:22:36 +0100 |
| commit | 6bb1ef668e21bdf66128c8bc0341b1811e3e5bbe (patch) | |
| tree | 23cc228faaf0a202b8086e54f925506e4f6ce12d /gnu | |
| parent | 80118dcf72fa27f69fefd35d0613192ea4b6611a (diff) | |
gnu: nextpnr: Switch to Qt6.
* gnu/packages/electronics.scm (delkw): Add variable.
* gnu/packages/electronics.scm (nextpnr)[inputs]: Remove boost-1.88,
qtbase-5, and qtwayland-5; add boost.
* gnu/packages/electronics.scm (nextpnr-cli)[arguments]:
Remove #:qtbase.
[inputs]: Undelete ’qtbase-5 and ’qtwayland-5.
Change-Id: Ib7fd1680b8245199d6f2bf2dbcd25a480220b7f1
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/electronics.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 6cc08c6236d..f660edbbc4c 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -143,6 +143,8 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages xml)) +(define delkw (@@ (guix utils) delkw)) + (define-public aacircuit ;; No release in PyPI or version tag on Git, use the latest commit. (let ((commit "18635c846754b6219da1a2ceb8977714f70004d0") @@ -1651,6 +1653,7 @@ that the layout of a circuit corresponds to the desired netlists.") (build-system qt-build-system) (arguments (list + #:qtbase qtbase ;for Qt 6 #:configure-flags #~(list "-DARCH=generic;ice40;ecp5;himbaechel" "-DBUILD_GUI=ON" @@ -1733,11 +1736,9 @@ that the layout of a circuit corresponds to the desired netlists.") sanitizers-cmake yosys)) (inputs - (list boost-1.88 + (list boost eigen pybind11 - qtbase-5 - qtwayland-5 qtimgui)) (synopsis "Place-and-Route tool for @acronym{FPGA, Field Programmable Gate Array}") @@ -1752,12 +1753,14 @@ Automation}, portable and vendor neutral FPGA place and route tool.") (name "nextpnr-cli") (build-system cmake-build-system) (arguments - (substitute-keyword-arguments (package-arguments nextpnr) - ((#:configure-flags flags '()) - #~(delete! "-DBUILD_GUI=ON" #$flags)))) + (delkw + #:qtbase + (substitute-keyword-arguments (package-arguments nextpnr) + ((#:configure-flags flags '()) + #~(delete! "-DBUILD_GUI=ON" #$flags))))) (inputs (modify-inputs (package-inputs nextpnr) - (delete "qtbase-5" "qtwayland-5" "qtimgui"))) + (delete "qtimgui"))) (synopsis (string-append (package-synopsis nextpnr) " Cli only version.")))) |