From 92ba3b59a2ff1dd6b4078c649a468fa208b47a59 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 21 Feb 2020 21:14:57 -0800 Subject: [PATCH 3/4] gnu: freecad. Fix build failures. * gnu/packages/engineering.scm (freecad): [supported-systems] Only support aarch64 and x86_64-linux, [inputs] use qtbase-patched instead of qtbase. --- gnu/packages/engineering.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 73fea26695..e84e7a87e9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2242,6 +2242,17 @@ full programmatic control over your models.") (home-page "https://www.openscad.org/") (license license:gpl2+))) +(define qtbase-patched + (let ((src (package-source qtbase))) + (package + (inherit qtbase) + (source + (origin + (inherit src) + (patches + (append (search-patches "qtbase-QTBUG-81715.patch") + (origin-patches src)))))) )) + (define-public freecad (package (name "freecad") @@ -2282,7 +2293,7 @@ full programmatic control over your models.") ("python-pyside-2-tools" ,python-pyside-2-tools) ("python-shiboken-2" ,python-shiboken-2) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-patched) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns) @@ -2314,6 +2325,7 @@ full programmatic control over your models.") (list "PYTHONPATH" 'prefix (list (getenv "PYTHONPATH"))))) #t))))) + (supported-systems '("x86_64-linux" "aarch64-linux")) (home-page "https://www.freecadweb.org/") (synopsis "Your Own 3D Parametric Modeler") (description -- 2.25.1