summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan Tildesley <mail@brendan.scot>2025-12-01 02:01:56 +1100
committerAndreas Enge <andreas@enge.fr>2025-12-15 10:13:59 +0100
commit1d81d04d2b6be68d2c653fa240627084082c19e2 (patch)
tree8690d2e4ef4061c9eb8b9d82e719338b168d0c24
parent4a2ea8fab61b13b453298ef007278d16cc591403 (diff)
gnu: qtbase@6: Don't install test junk.
* gnu/packages/qt.scm (qtbase)[arguments]: Replace ineffective delete-installed-tests phase with dont-install-tests phase. Fixes: guix/guix#4529 Change-Id: I2ddd27e34a314e7a04de571d0bc1b13f75af66f4 Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
-rw-r--r--gnu/packages/qt.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7ac66e6c05..e86341e4fb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -20,7 +20,7 @@
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022, 2025 Brendan Tildesley <mail@brendan.scot>
;;; 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>
@@ -1192,10 +1192,10 @@ tst_qt_cmake_create.cpp"
'("device_config.prf" "moc.prf" "qt_config.prf"))
(("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
(("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))
- (add-after 'install 'delete-installed-tests
+ (add-before 'install 'dont-install-tests
(lambda _
- (delete-file-recursively
- (string-append #$output "/tests"))))))))
+ (substitute* "cmake_install.cmake"
+ (("include.*tests/cmake_install") "#"))))))))
(native-inputs
(modify-inputs (package-native-inputs qtbase-5)
(prepend ninja ;CMake Generator, also used for tests