summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@friendly-machines.com>2026-03-01 14:36:07 +0100
committerDanny Milosavljevic <dannym@friendly-machines.com>2026-03-08 09:56:49 +0100
commit90d5f4f76ab09f589ed6ac4afe0ce19de7b141d7 (patch)
treeb14c292b965a7dff3fda8354578f44cb72412925
parentf3aa6afd0bb611e94e849d6a0f8a1ccb2b543148 (diff)
gnu: octave: Support Wayland.
* gnu/packages/maths.scm (octave)[inputs]: Add qtwayland-5. [arguments]<#:modules>: New field. <#:imported-modules>: New field. <#:phases>{wrap-qt}: New phase. Change-Id: I48ff6150f68063a2a9ead3fd84610a19f44996cf
-rw-r--r--gnu/packages/maths.scm17
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 025c94857c1..2ddd178ff62 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3488,6 +3488,7 @@ script files.")
3488 (inputs 3488 (inputs
3489 `(("qscintilla" ,qscintilla) 3489 `(("qscintilla" ,qscintilla)
3490 ("qt" ,qtbase-5) 3490 ("qt" ,qtbase-5)
3491 ("qtwayland" ,qtwayland-5)
3491 ,@(package-inputs octave-cli))) 3492 ,@(package-inputs octave-cli)))
3492 (native-inputs 3493 (native-inputs
3493 `(("qttools-5" , qttools-5) ;for lrelease 3494 `(("qttools-5" , qttools-5) ;for lrelease
@@ -3495,6 +3496,10 @@ script files.")
3495 ,@(package-native-inputs octave-cli))) 3496 ,@(package-native-inputs octave-cli)))
3496 (arguments 3497 (arguments
3497 (substitute-keyword-arguments (package-arguments octave-cli) 3498 (substitute-keyword-arguments (package-arguments octave-cli)
3499 ((#:modules modules %default-gnu-modules)
3500 `((guix build qt-utils) ,@modules))
3501 ((#:imported-modules imported-modules %default-gnu-imported-modules)
3502 `((guix build qt-utils) ,@imported-modules))
3498 ((#:phases phases) 3503 ((#:phases phases)
3499 `(modify-phases ,phases 3504 `(modify-phases ,phases
3500 (add-before 'configure 'patch-qscintilla-library-name 3505 (add-before 'configure 'patch-qscintilla-library-name
@@ -3506,7 +3511,17 @@ script files.")
3506 (substitute* "configure" 3511 (substitute* "configure"
3507 (("qscintilla2-qt5") 3512 (("qscintilla2-qt5")
3508 "qscintilla2_qt5")) 3513 "qscintilla2_qt5"))
3509 #t)))))) 3514 #t))
3515 (add-after 'install 'wrap-qt
3516 (lambda* (#:key inputs outputs #:allow-other-keys)
3517 (let ((out (assoc-ref outputs "out")))
3518 (with-directory-excursion out
3519 (for-each
3520 (lambda (x)
3521 (wrap-qt-program (string-append "../" x)
3522 #:output out
3523 #:inputs inputs))
3524 (find-files "libexec" "^octave-gui$"))))))))))
3510 (synopsis "High-level language for numerical computation (with GUI)"))) 3525 (synopsis "High-level language for numerical computation (with GUI)")))
3511 3526
3512(define-public opencascade-occt 3527(define-public opencascade-occt