[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/12: gnu: qtscxml: Fix build failure.
From: |
guix-commits |
Subject: |
01/12: gnu: qtscxml: Fix build failure. |
Date: |
Sat, 13 Aug 2022 13:25:18 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit b9a3083db380671b3f034ca5c230804f4d4a84da
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Aug 12 13:19:30 2022 +0200
gnu: qtscxml: Fix build failure.
This fixes a faulty conflict resolution from the merge in commit
b50eaa67642ebc25e9c896f2e700c08610e0a5da.
* gnu/packages/qt.scm (qtscxml)[arguments]: Substitute arguments from
QTSVG-5,
not QTSVG.
---
gnu/packages/qt.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2e0ade2376..f8d7d5e428 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1887,7 +1887,7 @@ and mobile applications targeting TV-like form
factors.")))
(substitute* "tests/auto/auto.pro"
(("scion") "#"))))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative-5))
- branch staging updated (b50eaa6764 -> 213c60f332), guix-commits, 2022/08/13
- 01/12: gnu: qtscxml: Fix build failure.,
guix-commits <=
- 02/12: gnu: python-pympler: Update to 1.0.1., guix-commits, 2022/08/13
- 03/12: gnu: python-dateutil: Adjust tests for Pytest 7., guix-commits, 2022/08/13
- 04/12: gnu: python-sphinx: Update to 5.1.1., guix-commits, 2022/08/13
- 12/12: gnu: texlive-hyperref: Propagate more inputs., guix-commits, 2022/08/13
- 06/12: gnu: python-freezegun: Adjust for Python 3.10., guix-commits, 2022/08/13
- 07/12: gnu: gtk-doc: Remove unused input., guix-commits, 2022/08/13
- 05/12: gnu: python-freezegun: Update to 1.2.2., guix-commits, 2022/08/13
- 10/12: gnu: python-sphinx: Add 4.5.0., guix-commits, 2022/08/13
- 09/12: gnu: gtk-doc/stable: Use 'modify-inputs'., guix-commits, 2022/08/13
- 08/12: gnu: gtk-doc: Remove input labels., guix-commits, 2022/08/13