diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
| commit | 8de4131b2ddd11faa3394cf497484563068c9e7a (patch) | |
| tree | ed4ed9e586c7236f09c109afdd416dac18ba8cc3 /gnu/packages/qt.scm | |
| parent | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (diff) | |
| parent | 45b7a8bfda5bde2e2daee4bec0ca092cd719d726 (diff) | |
| download | guix-8de4131b2ddd11faa3394cf497484563068c9e7a.tar.gz guix-8de4131b2ddd11faa3394cf497484563068c9e7a.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index de070ecaf3..e8654eee44 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1120,7 +1120,7 @@ from within Qt 5."))) (define-public qxlsx (package (name "qxlsx") - (version "1.4.5") + (version "1.4.6") (source (origin (method git-fetch) @@ -1129,7 +1129,8 @@ from within Qt 5."))) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1h95h96vz47cnfp62j7bx6ih725gbv005hm0cfqanfvqd5xd9qsg")))) + (base32 "0xbpajvwkv09h2fang200nsanv5gl1alsdd725gh9cgq4szng6gj")) + (patches (search-patches "qxlsx-fix-include-directory.patch")))) (build-system cmake-build-system) (arguments (list @@ -3126,7 +3127,6 @@ linux/libcurl_wrapper.h" (inputs (modify-inputs (package-inputs qtwebengine-5) (replace "qtmultimedia" qtmultimedia) - (replace "harfbuzz" harfbuzz-5) (append libxkbfile xkeyboard-config))) (propagated-inputs (modify-inputs (package-propagated-inputs qtwebengine-5) @@ -4005,6 +4005,7 @@ color-related widgets.") (substitute-keyword-arguments (package-arguments python-shiboken-2) ((#:phases p) #~(modify-phases #$p + (delete 'workaround-importlib-error) (replace 'use-shiboken-dir-only (lambda _ (chdir "sources/shiboken6"))))) ((#:configure-flags flags) |