diff options
| author | Greg Hogan <code@greghogan.com> | 2025-05-07 19:32:39 +0000 |
|---|---|---|
| committer | Greg Hogan <code@greghogan.com> | 2025-08-04 04:11:21 +0000 |
| commit | f4ce754028280131fe9c373ee5b94c26d28742bb (patch) | |
| tree | a39dc97b00d72b8bbd0249fac5c5982e9d4cf85f /gnu | |
| parent | 27e0cb7edaab5be116c29c858126d79683b1759a (diff) | |
gnu: Restore gnu-build-system phases.
* gnu/packages/bioinformatics.scm (bandage),
* gnu/packages/education.scm (openboard),
* gnu/packages/emulators.scm (qtmips),
* gnu/packages/games.scm (chessx),
* gnu/packages/kde-systemtools.scm (spectacle-ocr-screenshot),
* gnu/packages/qt.scm (pyotherside, qtwidgetanimationframework)
<#:phases>: Restore build phase.
* gnu/packages/admin.scm (wpa-supplicant-gui),
* gnu/packages/finance.scm (kitsas)
[arguments]<#:tests?>: Disable.
<#:phases>: Restore build phase.
* gnu/packages/engineering.scm (librecad)
[arguments]<#:test-target>: Delete.
<#:phases>: Restore build and check phases.
* gnu/packages/music.scm (samplebrain)
<#:phases>: Restore build, check, and install phases.
* gnu/packages/password-utils.scm (qtpass)
[arguments]<#:test-target>: Delete.
<#:phases>: Restore build, check, and install phases.
* gnu/packages/ebook.scm (inkbox),
* gnu/packages/engineering.scm (qelectrotech),
* gnu/packages/games.scm (doom-runner, moonlight-qt, pokerth,
qcheckers),
* gnu/packages/gps.scm (gpxsee),
* gnu/packages/hardware.scm (openrgb),
* gnu/packages/image-viewers.scm (qview),
* gnu/packages/pdf.scm (qpdfview),
* gnu/packages/qt.scm (signond),
* gnu/packages/radio.scm (dream)
<#:phases>: Restore build and install phases.
* gnu/packages/disk.scm (qdirstat),
* gnu/packages/pdf.scm (sioyek),
* gnu/packages/qt.scm (signon-plugin-oauth2),
* gnu/packages/radio.scm (qsstv, wfview),
* gnu/packages/security-token.scm (yubikey-manager-qt),
* gnu/packages/tex.scm (texmaker),
* gnu/packages/video.scm (smplayer)
[arguments]<#:tests?>: Disable.
<#:phases>: Restore build and install phases.
* gnu/packages/task-management.scm (timewarrior)
<#:phases>: Restore check phase.
* gnu/packages/audio.scm (supercollider)
<#:phases>: Restore install phase.
* gnu/packages/web.scm (libzim): Update to 9.3.0.
(kiwix-lib): Update to 14.0.0.
(kiwix-desktop): Update to 2.4.1.
[source](patches): Delete.
[arguments]<#:test-target>: Delete.
[arguments]<#:tests?>: Disable.
<#:phases>: Restore build and install phases.
(kiwix-tools): Update to 3.7.0.
* gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch: Delete.
* gnu/local.mk: Update accordingly.
Change-Id: Ia5162ec190fc21334bbc516dcc01056d599f2891
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/admin.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/audio.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/disk.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/ebook.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/education.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/emulators.scm | 71 | ||||
| -rw-r--r-- | gnu/packages/engineering.scm | 29 | ||||
| -rw-r--r-- | gnu/packages/finance.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/games.scm | 85 | ||||
| -rw-r--r-- | gnu/packages/gps.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/hardware.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/image-viewers.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/kde-systemtools.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/password-utils.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch | 40 | ||||
| -rw-r--r-- | gnu/packages/pdf.scm | 16 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 22 | ||||
| -rw-r--r-- | gnu/packages/radio.scm | 89 | ||||
| -rw-r--r-- | gnu/packages/security-token.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/task-management.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/tex.scm | 32 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/web.scm | 39 |
26 files changed, 322 insertions, 195 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index af80152ffa7..2844295d99b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -1716,7 +1716,6 @@ dist_patch_DATA = \ | |||
| 1716 | %D%/packages/patches/kio-search-smbd-on-PATH.patch \ | 1716 | %D%/packages/patches/kio-search-smbd-on-PATH.patch \ |
| 1717 | %D%/packages/patches/kismet-unbundle-boost.patch \ | 1717 | %D%/packages/patches/kismet-unbundle-boost.patch \ |
| 1718 | %D%/packages/patches/kitty-fix-wayland-protocols.patch \ | 1718 | %D%/packages/patches/kitty-fix-wayland-protocols.patch \ |
| 1719 | %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch \ | ||
| 1720 | %D%/packages/patches/kmod-module-directory.patch \ | 1719 | %D%/packages/patches/kmod-module-directory.patch \ |
| 1721 | %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ | 1720 | %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ |
| 1722 | %D%/packages/patches/knot-remove-runtime-deps.patch \ | 1721 | %D%/packages/patches/knot-remove-runtime-deps.patch \ |
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d9d2f59c847..7012b5dd3b4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm | |||
| @@ -2689,16 +2689,20 @@ command.") | |||
| 2689 | (build-system qt-build-system) | 2689 | (build-system qt-build-system) |
| 2690 | (arguments | 2690 | (arguments |
| 2691 | (list | 2691 | (list |
| 2692 | #:tests? #f ; no tests | ||
| 2692 | ;; Make sure the (rarely updated) package 'imagemagick/stable' | 2693 | ;; Make sure the (rarely updated) package 'imagemagick/stable' |
| 2693 | ;; does not end up in the closure. | 2694 | ;; does not end up in the closure. |
| 2694 | #:disallowed-references (list imagemagick/stable) | 2695 | #:disallowed-references (list imagemagick/stable) |
| 2695 | #:test-target "check" | 2696 | #:modules '((guix build qt-build-system) |
| 2697 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 2698 | (guix build utils)) | ||
| 2696 | #:phases | 2699 | #:phases |
| 2697 | #~(modify-phases %standard-phases | 2700 | #~(modify-phases %standard-phases |
| 2698 | (add-after 'unpack 'chdir | 2701 | (add-after 'unpack 'chdir |
| 2699 | (lambda _ (chdir "wpa_supplicant/wpa_gui-qt4"))) | 2702 | (lambda _ (chdir "wpa_supplicant/wpa_gui-qt4"))) |
| 2700 | (replace 'configure | 2703 | (replace 'configure |
| 2701 | (lambda _ (invoke "qmake" "wpa_gui.pro"))) | 2704 | (lambda _ (invoke "qmake" "wpa_gui.pro"))) |
| 2705 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 2702 | (add-after 'build 'build-icons | 2706 | (add-after 'build 'build-icons |
| 2703 | (lambda _ | 2707 | (lambda _ |
| 2704 | ;; Inkscape complains (but works) without a writable $HOME. | 2708 | ;; Inkscape complains (but works) without a writable $HOME. |
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 59ddbe8ac11..c481b5a3de1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm | |||
| @@ -4221,6 +4221,9 @@ link REQUIRED)")))))) | |||
| 4221 | "-DFORTIFY=ON" | 4221 | "-DFORTIFY=ON" |
| 4222 | "-DLIBSCSYNTH=ON" | 4222 | "-DLIBSCSYNTH=ON" |
| 4223 | "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel | 4223 | "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel |
| 4224 | #:modules '((guix build cmake-build-system) | ||
| 4225 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 4226 | (guix build utils)) | ||
| 4224 | #:phases | 4227 | #:phases |
| 4225 | #~(modify-phases %standard-phases | 4228 | #~(modify-phases %standard-phases |
| 4226 | ;; HOME must be defined otherwise supercollider throws a "ERROR: | 4229 | ;; HOME must be defined otherwise supercollider throws a "ERROR: |
| @@ -4248,6 +4251,7 @@ link REQUIRED)")))))) | |||
| 4248 | (lambda _ | 4251 | (lambda _ |
| 4249 | (system "Xvfb &") | 4252 | (system "Xvfb &") |
| 4250 | (setenv "DISPLAY" ":0"))) | 4253 | (setenv "DISPLAY" ":0"))) |
| 4254 | (replace 'install (assoc-ref gnu:%standard-phases 'install)) | ||
| 4251 | (add-before 'install 'install-ide | 4255 | (add-before 'install 'install-ide |
| 4252 | (lambda _ | 4256 | (lambda _ |
| 4253 | (let* ((ide #$output:ide) | 4257 | (let* ((ide #$output:ide) |
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7ddb0b93ce9..e3572313ce3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm | |||
| @@ -18821,6 +18821,9 @@ Thus the per-base error rate is similar to the raw input reads.") | |||
| 18821 | (build-system qt-build-system) | 18821 | (build-system qt-build-system) |
| 18822 | (arguments | 18822 | (arguments |
| 18823 | (list | 18823 | (list |
| 18824 | #:modules '((guix build qt-build-system) | ||
| 18825 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 18826 | (guix build utils)) | ||
| 18824 | ;; TODO: Once <https://issues.guix.gnu.org/47475> is fixed, | 18827 | ;; TODO: Once <https://issues.guix.gnu.org/47475> is fixed, |
| 18825 | ;; consider uncommenting the following: | 18828 | ;; consider uncommenting the following: |
| 18826 | ;; | 18829 | ;; |
| @@ -18841,6 +18844,7 @@ Thus the per-base error rate is similar to the raw input reads.") | |||
| 18841 | (with-directory-excursion "tests" | 18844 | (with-directory-excursion "tests" |
| 18842 | (setenv "XDG_RUNTIME_DIR" (getcwd)) | 18845 | (setenv "XDG_RUNTIME_DIR" (getcwd)) |
| 18843 | (invoke "./bandage_command_line_tests.sh"))))) | 18846 | (invoke "./bandage_command_line_tests.sh"))))) |
| 18847 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 18844 | (replace 'install | 18848 | (replace 'install |
| 18845 | (lambda _ | 18849 | (lambda _ |
| 18846 | (install-file "Bandage" (string-append #$output "/bin"))))))) | 18850 | (install-file "Bandage" (string-append #$output "/bin"))))))) |
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 49584fc60eb..a452c849fc4 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm | |||
| @@ -1809,11 +1809,17 @@ wrapper for disk usage querying and visualisation.") | |||
| 1809 | (build-system qt-build-system) | 1809 | (build-system qt-build-system) |
| 1810 | (arguments | 1810 | (arguments |
| 1811 | (list | 1811 | (list |
| 1812 | #:tests? #f | ||
| 1813 | #:modules '((guix build qt-build-system) | ||
| 1814 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 1815 | (guix build utils)) | ||
| 1812 | #:phases | 1816 | #:phases |
| 1813 | #~(modify-phases %standard-phases | 1817 | #~(modify-phases %standard-phases |
| 1814 | (replace 'configure | 1818 | (replace 'configure |
| 1815 | (lambda _ | 1819 | (lambda _ |
| 1816 | (system* "qmake" (string-append "INSTALL_PREFIX=" #$output)))) | 1820 | (system* "qmake" (string-append "INSTALL_PREFIX=" #$output)))) |
| 1821 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 1822 | (replace 'install (assoc-ref gnu:%standard-phases 'install)) | ||
| 1817 | (add-after 'install 'wrap | 1823 | (add-after 'install 'wrap |
| 1818 | (lambda _ | 1824 | (lambda _ |
| 1819 | (wrap-program (string-append #$output | 1825 | (wrap-program (string-append #$output |
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index d772d5244c1..8deb82aa406 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm | |||
| @@ -405,6 +405,9 @@ accessing and converting various ebook file formats.") | |||
| 405 | #:tests? #f ; no test suite | 405 | #:tests? #f ; no test suite |
| 406 | #:make-flags | 406 | #:make-flags |
| 407 | #~(list (string-append "PREFIX=" #$output)) | 407 | #~(list (string-append "PREFIX=" #$output)) |
| 408 | #:modules '((guix build qt-build-system) | ||
| 409 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 410 | (guix build utils)) | ||
| 408 | #:phases | 411 | #:phases |
| 409 | #~(modify-phases %standard-phases | 412 | #~(modify-phases %standard-phases |
| 410 | (add-after 'unpack 'prefix-opt | 413 | (add-after 'unpack 'prefix-opt |
| @@ -414,7 +417,9 @@ accessing and converting various ebook file formats.") | |||
| 414 | #$output)))) | 417 | #$output)))) |
| 415 | (replace 'configure | 418 | (replace 'configure |
| 416 | (lambda* (#:key make-flags #:allow-other-keys) | 419 | (lambda* (#:key make-flags #:allow-other-keys) |
| 417 | (apply invoke (cons "qmake" make-flags))))))) | 420 | (apply invoke (cons "qmake" make-flags)))) |
| 421 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 422 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 418 | (native-inputs | 423 | (native-inputs |
| 419 | (list qtbase-5)) | 424 | (list qtbase-5)) |
| 420 | (synopsis "EBook reader") | 425 | (synopsis "EBook reader") |
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 5e0d467cc0d..1f022b06b46 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm | |||
| @@ -514,6 +514,9 @@ specialized device.") | |||
| 514 | (arguments | 514 | (arguments |
| 515 | (list | 515 | (list |
| 516 | #:tests? #f ;no tests | 516 | #:tests? #f ;no tests |
| 517 | #:modules '((guix build qt-build-system) | ||
| 518 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 519 | (guix build utils)) | ||
| 517 | #:phases | 520 | #:phases |
| 518 | #~(modify-phases %standard-phases | 521 | #~(modify-phases %standard-phases |
| 519 | (add-after 'unpack 'set-initial-values | 522 | (add-after 'unpack 'set-initial-values |
| @@ -542,6 +545,7 @@ specialized device.") | |||
| 542 | (replace 'configure | 545 | (replace 'configure |
| 543 | (lambda _ | 546 | (lambda _ |
| 544 | (invoke "qmake" "OpenBoard.pro"))) | 547 | (invoke "qmake" "OpenBoard.pro"))) |
| 548 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 545 | (replace 'install | 549 | (replace 'install |
| 546 | (lambda* (#:key inputs #:allow-other-keys) | 550 | (lambda* (#:key inputs #:allow-other-keys) |
| 547 | (let* ((share (string-append #$output "/share")) | 551 | (let* ((share (string-append #$output "/share")) |
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index eb196818a6d..130b2e0877e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm | |||
| @@ -873,39 +873,44 @@ emulate a serial nullmodem over TCP/IP.") | |||
| 873 | "1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp")))) | 873 | "1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp")))) |
| 874 | (build-system qt-build-system) | 874 | (build-system qt-build-system) |
| 875 | (arguments | 875 | (arguments |
| 876 | '(#:phases | 876 | (list |
| 877 | (modify-phases %standard-phases | 877 | #:modules '((guix build qt-build-system) |
| 878 | (replace 'configure | 878 | ((guix build gnu-build-system) #:prefix gnu:) |
| 879 | (lambda* (#:key outputs #:allow-other-keys) | 879 | (guix build utils)) |
| 880 | (invoke "qmake" | 880 | #:phases |
| 881 | (string-append "PREFIX=" (assoc-ref outputs "out")) | 881 | #~(modify-phases %standard-phases |
| 882 | "qtmips.pro"))) | 882 | (replace 'configure |
| 883 | (replace 'check | 883 | (lambda* (#:key outputs #:allow-other-keys) |
| 884 | (lambda* (#:key tests? #:allow-other-keys) | 884 | (invoke "qmake" |
| 885 | (substitute* "tests/test.sh" | 885 | (string-append "PREFIX=" (assoc-ref outputs "out")) |
| 886 | (("qtchooser.*") "")) | 886 | "qtmips.pro"))) |
| 887 | (substitute* '("tests/cpu_trap/test.sh" | 887 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) |
| 888 | "tests/registers/test.sh") | 888 | (replace 'check |
| 889 | (("sub-qtmips_cli") "qtmips_cli")) | 889 | (lambda* (#:key tests? #:allow-other-keys) |
| 890 | (if tests? | 890 | (substitute* "tests/test.sh" |
| 891 | (invoke "tests/run-all.sh") | 891 | (("qtchooser.*") "")) |
| 892 | #t))) | 892 | (substitute* '("tests/cpu_trap/test.sh" |
| 893 | (replace 'install | 893 | "tests/registers/test.sh") |
| 894 | ;; There is no install target. | 894 | (("sub-qtmips_cli") "qtmips_cli")) |
| 895 | (lambda* (#:key outputs #:allow-other-keys) | 895 | (if tests? |
| 896 | (let* ((out (assoc-ref outputs "out")) | 896 | (invoke "tests/run-all.sh") |
| 897 | (bin (string-append out "/bin")) | 897 | #t))) |
| 898 | (apps (string-append out "/share/applications")) | 898 | (replace 'install |
| 899 | (icons (string-append out "/share/icons/hicolor"))) | 899 | ;; There is no install target. |
| 900 | (install-file "qtmips_gui/qtmips_gui" bin) | 900 | (lambda* (#:key outputs #:allow-other-keys) |
| 901 | (install-file "qtmips_cli/qtmips_cli" bin) | 901 | (let* ((out (assoc-ref outputs "out")) |
| 902 | (install-file "data/qtmips.desktop" apps) | 902 | (bin (string-append out "/bin")) |
| 903 | (install-file "data/icons/qtmips_gui.svg" | 903 | (apps (string-append out "/share/applications")) |
| 904 | (string-append icons "/scalable/apps")) | 904 | (icons (string-append out "/share/icons/hicolor"))) |
| 905 | (install-file "data/icons/qtmips_gui.png" | 905 | (install-file "qtmips_gui/qtmips_gui" bin) |
| 906 | (string-append icons "/48x48/apps")) | 906 | (install-file "qtmips_cli/qtmips_cli" bin) |
| 907 | #t)))) | 907 | (install-file "data/qtmips.desktop" apps) |
| 908 | #:tests? #f)) ; test suite wants mips toolchain | 908 | (install-file "data/icons/qtmips_gui.svg" |
| 909 | (string-append icons "/scalable/apps")) | ||
| 910 | (install-file "data/icons/qtmips_gui.png" | ||
| 911 | (string-append icons "/48x48/apps")) | ||
| 912 | #t)))) | ||
| 913 | #:tests? #f)) ; test suite wants mips toolchain | ||
| 909 | (inputs | 914 | (inputs |
| 910 | (list elfutils qtbase-5 qtwayland-5)) | 915 | (list elfutils qtbase-5 qtwayland-5)) |
| 911 | (home-page "https://github.com/cvut/QtMips") | 916 | (home-page "https://github.com/cvut/QtMips") |
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index efc419fb790..9cc1fb89181 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm | |||
| @@ -311,21 +311,25 @@ their devices.") | |||
| 311 | (build-system qt-build-system) | 311 | (build-system qt-build-system) |
| 312 | (arguments | 312 | (arguments |
| 313 | (list | 313 | (list |
| 314 | #:test-target "check" | 314 | #:modules '((guix build qt-build-system) |
| 315 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 316 | (guix build utils)) | ||
| 315 | #:phases | 317 | #:phases |
| 316 | #~(modify-phases %standard-phases | 318 | #~(modify-phases %standard-phases |
| 317 | (replace 'configure | 319 | (replace 'configure |
| 318 | (lambda _ | 320 | (lambda _ |
| 319 | (system* "qmake" (string-append "BOOST_DIR=" | 321 | (system* "qmake" (string-append "BOOST_DIR=" |
| 320 | #$(this-package-input "boost"))))) | 322 | #$(this-package-input "boost"))))) |
| 321 | (replace 'install | 323 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) |
| 322 | (lambda* (#:key outputs #:allow-other-keys) | 324 | (replace 'check (assoc-ref gnu:%standard-phases 'check)) |
| 323 | (let ((bin (string-append #$output "/bin")) | 325 | (replace 'install |
| 324 | (share (string-append #$output "/share/librecad"))) | 326 | (lambda* (#:key outputs #:allow-other-keys) |
| 325 | (mkdir-p bin) | 327 | (let ((bin (string-append #$output "/bin")) |
| 326 | (install-file "unix/librecad" bin) | 328 | (share (string-append #$output "/share/librecad"))) |
| 327 | (mkdir-p share) | 329 | (mkdir-p bin) |
| 328 | (copy-recursively "unix/resources" share))))))) | 330 | (install-file "unix/librecad" bin) |
| 331 | (mkdir-p share) | ||
| 332 | (copy-recursively "unix/resources" share))))))) | ||
| 329 | (inputs | 333 | (inputs |
| 330 | (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5)) | 334 | (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5)) |
| 331 | (native-inputs | 335 | (native-inputs |
| @@ -906,6 +910,9 @@ required for Fritzing app.") | |||
| 906 | ;; XXX: tests are built for the CMake build option but it seems to be | 910 | ;; XXX: tests are built for the CMake build option but it seems to be |
| 907 | ;; broken in 0.8.0. | 911 | ;; broken in 0.8.0. |
| 908 | (list #:tests? #f | 912 | (list #:tests? #f |
| 913 | #:modules '((guix build qt-build-system) | ||
| 914 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 915 | (guix build utils)) | ||
| 909 | #:phases | 916 | #:phases |
| 910 | #~(modify-phases %standard-phases | 917 | #~(modify-phases %standard-phases |
| 911 | (replace 'configure | 918 | (replace 'configure |
| @@ -913,7 +920,9 @@ required for Fritzing app.") | |||
| 913 | ;; Patch hardcoded path before running qmake. | 920 | ;; Patch hardcoded path before running qmake. |
| 914 | (substitute* "qelectrotech.pro" | 921 | (substitute* "qelectrotech.pro" |
| 915 | (("\\/usr\\/local") #$output)) | 922 | (("\\/usr\\/local") #$output)) |
| 916 | (invoke "qmake")))))) | 923 | (invoke "qmake"))) |
| 924 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 925 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 917 | (native-inputs | 926 | (native-inputs |
| 918 | (list pkg-config qttools-5)) | 927 | (list pkg-config qttools-5)) |
| 919 | (inputs | 928 | (inputs |
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 1bc64735b70..20c53567653 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm | |||
| @@ -1359,8 +1359,10 @@ agent.") | |||
| 1359 | (inputs (list libzip qtsvg qtwebengine qt5compat)) | 1359 | (inputs (list libzip qtsvg qtwebengine qt5compat)) |
| 1360 | (arguments | 1360 | (arguments |
| 1361 | (list #:tests? #f ; tests do not even build with Qt6 anymore | 1361 | (list #:tests? #f ; tests do not even build with Qt6 anymore |
| 1362 | #:test-target "check" | ||
| 1363 | #:qtbase qtbase ; use Qt6 | 1362 | #:qtbase qtbase ; use Qt6 |
| 1363 | #:modules '((guix build qt-build-system) | ||
| 1364 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 1365 | (guix build utils)) | ||
| 1364 | #:phases | 1366 | #:phases |
| 1365 | #~(modify-phases %standard-phases | 1367 | #~(modify-phases %standard-phases |
| 1366 | (replace 'configure | 1368 | (replace 'configure |
| @@ -1372,6 +1374,7 @@ agent.") | |||
| 1372 | (substitute* "kitsasproject.pro" | 1374 | (substitute* "kitsasproject.pro" |
| 1373 | ((" *(unittest|testit).*") "") | 1375 | ((" *(unittest|testit).*") "") |
| 1374 | (("\\\\") "")))) | 1376 | (("\\\\") "")))) |
| 1377 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 1375 | (replace 'install | 1378 | (replace 'install |
| 1376 | (lambda* _ | 1379 | (lambda* _ |
| 1377 | (install-file "kitsas/kitsas" | 1380 | (install-file "kitsas/kitsas" |
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 35c6feb0d75..12d4efff4af 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm | |||
| @@ -1554,6 +1554,9 @@ practise.") | |||
| 1554 | (arguments | 1554 | (arguments |
| 1555 | (list | 1555 | (list |
| 1556 | #:tests? #f ;no tests | 1556 | #:tests? #f ;no tests |
| 1557 | #:modules '((guix build qt-build-system) | ||
| 1558 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 1559 | (guix build utils)) | ||
| 1557 | #:phases | 1560 | #:phases |
| 1558 | #~(modify-phases %standard-phases | 1561 | #~(modify-phases %standard-phases |
| 1559 | (replace 'configure | 1562 | (replace 'configure |
| @@ -1563,6 +1566,8 @@ practise.") | |||
| 1563 | #$output)) | 1566 | #$output)) |
| 1564 | (invoke "qmake" "DoomRunner.pro" "-spec" "linux-g++" | 1567 | (invoke "qmake" "DoomRunner.pro" "-spec" "linux-g++" |
| 1565 | "\"CONFIG+=release\""))) | 1568 | "\"CONFIG+=release\""))) |
| 1569 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 1570 | (replace 'install (assoc-ref gnu:%standard-phases 'install)) | ||
| 1566 | (add-after 'install 'install-xdg | 1571 | (add-after 'install 'install-xdg |
| 1567 | (lambda _ | 1572 | (lambda _ |
| 1568 | (with-directory-excursion "Install/XDG" | 1573 | (with-directory-excursion "Install/XDG" |
| @@ -7183,6 +7188,9 @@ colors, pictures, and sounds.") | |||
| 7183 | (arguments | 7188 | (arguments |
| 7184 | (list | 7189 | (list |
| 7185 | #:tests? #f ;no test suite | 7190 | #:tests? #f ;no test suite |
| 7191 | #:modules '((guix build qt-build-system) | ||
| 7192 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 7193 | (guix build utils)) | ||
| 7186 | #:phases | 7194 | #:phases |
| 7187 | #~(modify-phases %standard-phases | 7195 | #~(modify-phases %standard-phases |
| 7188 | (replace 'configure | 7196 | (replace 'configure |
| @@ -7198,7 +7206,9 @@ colors, pictures, and sounds.") | |||
| 7198 | ((" h264bitstream.*\n") "") | 7206 | ((" h264bitstream.*\n") "") |
| 7199 | ((" app \\\\") " app") | 7207 | ((" app \\\\") " app") |
| 7200 | (("app.depends") "INCLUDEPATH +=")) | 7208 | (("app.depends") "INCLUDEPATH +=")) |
| 7201 | (invoke "qmake" (string-append "PREFIX=" #$output))))))) | 7209 | (invoke "qmake" (string-append "PREFIX=" #$output)))) |
| 7210 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 7211 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 7202 | (native-inputs (list pkg-config qttools-5)) | 7212 | (native-inputs (list pkg-config qttools-5)) |
| 7203 | (inputs (list ffmpeg | 7213 | (inputs (list ffmpeg |
| 7204 | h264bitstream | 7214 | h264bitstream |
| @@ -11831,12 +11841,17 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") | |||
| 11831 | (arguments | 11841 | (arguments |
| 11832 | (list | 11842 | (list |
| 11833 | #:tests? #f | 11843 | #:tests? #f |
| 11844 | #:modules '((guix build qt-build-system) | ||
| 11845 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 11846 | (guix build utils)) | ||
| 11834 | #:phases | 11847 | #:phases |
| 11835 | #~(modify-phases %standard-phases | 11848 | #~(modify-phases %standard-phases |
| 11836 | (replace 'configure | 11849 | (replace 'configure |
| 11837 | (lambda _ | 11850 | (lambda _ |
| 11838 | (invoke "qmake" | 11851 | (invoke "qmake" |
| 11839 | (string-append "PREFIX=" #$output))))))) | 11852 | (string-append "PREFIX=" #$output)))) |
| 11853 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 11854 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 11840 | (inputs (list qtbase-5 qtsvg-5)) | 11855 | (inputs (list qtbase-5 qtsvg-5)) |
| 11841 | (home-page "https://portnov.github.io/qcheckers/") | 11856 | (home-page "https://portnov.github.io/qcheckers/") |
| 11842 | (synopsis "Qt-based checkers boardgame") | 11857 | (synopsis "Qt-based checkers boardgame") |
| @@ -12023,35 +12038,36 @@ and chess engines.") | |||
| 12023 | (inputs | 12038 | (inputs |
| 12024 | (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) | 12039 | (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) |
| 12025 | (arguments | 12040 | (arguments |
| 12026 | `(#:tests? #f | 12041 | (list |
| 12027 | #:phases | 12042 | #:tests? #f |
| 12028 | (modify-phases %standard-phases | 12043 | #:modules '((guix build qt-build-system) |
| 12029 | (add-after 'unpack 'fix-paths | 12044 | ((guix build gnu-build-system) #:prefix gnu:) |
| 12030 | (lambda* (#:key inputs #:allow-other-keys) | 12045 | (guix build utils)) |
| 12031 | (substitute* "chessx.pro" | 12046 | #:phases |
| 12032 | (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") | 12047 | #~(modify-phases %standard-phases |
| 12033 | (search-input-file inputs "/bin/lrelease"))))) | 12048 | (add-after 'unpack 'fix-paths |
| 12034 | (add-after 'fix-paths 'make-qt-deterministic | 12049 | (lambda* (#:key inputs #:allow-other-keys) |
| 12035 | (lambda _ | 12050 | (substitute* "chessx.pro" |
| 12036 | (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") | 12051 | (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") |
| 12037 | #t)) | 12052 | (search-input-file inputs "/bin/lrelease"))))) |
| 12038 | (add-after 'make-qt-deterministic 'disable-versioncheck | 12053 | (add-after 'fix-paths 'make-qt-deterministic |
| 12039 | (lambda _ | 12054 | (lambda _ |
| 12040 | (substitute* "src/database/settings.cpp" | 12055 | (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1"))) |
| 12041 | (("\"/General/onlineVersionCheck\", true") | 12056 | (add-after 'make-qt-deterministic 'disable-versioncheck |
| 12042 | "\"/General/onlineVersionCheck\", false")) | 12057 | (lambda _ |
| 12043 | #t)) | 12058 | (substitute* "src/database/settings.cpp" |
| 12044 | (replace 'configure | 12059 | (("\"/General/onlineVersionCheck\", true") |
| 12045 | (lambda _ | 12060 | "\"/General/onlineVersionCheck\", false")))) |
| 12046 | (invoke "qmake") | 12061 | (replace 'configure |
| 12047 | #t)) | 12062 | (lambda _ |
| 12048 | (replace 'install | 12063 | (invoke "qmake"))) |
| 12049 | (lambda* (#:key outputs #:allow-other-keys) | 12064 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) |
| 12050 | (let ((out (assoc-ref outputs "out"))) | 12065 | (replace 'install |
| 12051 | (install-file "release/chessx" (string-append out "/bin")) | 12066 | (lambda* (#:key outputs #:allow-other-keys) |
| 12052 | (install-file "unix/chessx.desktop" | 12067 | (let ((out (assoc-ref outputs "out"))) |
| 12053 | (string-append out "/share/applications"))) | 12068 | (install-file "release/chessx" (string-append out "/bin")) |
| 12054 | #t))))) | 12069 | (install-file "unix/chessx.desktop" |
| 12070 | (string-append out "/share/applications")))))))) | ||
| 12055 | (synopsis "Chess game database") | 12071 | (synopsis "Chess game database") |
| 12056 | (description | 12072 | (description |
| 12057 | "ChessX is a chess database. With ChessX you can operate on your | 12073 | "ChessX is a chess database. With ChessX you can operate on your |
| @@ -12425,6 +12441,9 @@ game.") ;thanks to Debian for description | |||
| 12425 | (arguments | 12441 | (arguments |
| 12426 | (list | 12442 | (list |
| 12427 | #:tests? #f ; No test suite | 12443 | #:tests? #f ; No test suite |
| 12444 | #:modules '((guix build qt-build-system) | ||
| 12445 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 12446 | (guix build utils)) | ||
| 12428 | #:phases | 12447 | #:phases |
| 12429 | #~(modify-phases %standard-phases | 12448 | #~(modify-phases %standard-phases |
| 12430 | (add-after 'unpack 'fix-paths | 12449 | (add-after 'unpack 'fix-paths |
| @@ -12447,7 +12466,9 @@ game.") ;thanks to Debian for description | |||
| 12447 | (replace 'configure | 12466 | (replace 'configure |
| 12448 | (lambda _ | 12467 | (lambda _ |
| 12449 | (invoke "qmake" "pokerth.pro" "CONFIG+=client" | 12468 | (invoke "qmake" "pokerth.pro" "CONFIG+=client" |
| 12450 | (string-append "PREFIX=" #$output))))))) | 12469 | (string-append "PREFIX=" #$output)))) |
| 12470 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 12471 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 12451 | (home-page "https://www.pokerth.net") | 12472 | (home-page "https://www.pokerth.net") |
| 12452 | (synopsis "Texas holdem poker game") | 12473 | (synopsis "Texas holdem poker game") |
| 12453 | (description | 12474 | (description |
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index aefb993f799..8ee1515d6bf 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm | |||
| @@ -220,6 +220,9 @@ coordinates as well as partial support for adjustments in global coordinate syst | |||
| 220 | (list | 220 | (list |
| 221 | #:qtbase qtbase | 221 | #:qtbase qtbase |
| 222 | #:tests? #f ; no tests | 222 | #:tests? #f ; no tests |
| 223 | #:modules '((guix build qt-build-system) | ||
| 224 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 225 | (guix build utils)) | ||
| 223 | #:phases #~(modify-phases %standard-phases | 226 | #:phases #~(modify-phases %standard-phases |
| 224 | (replace 'configure | 227 | (replace 'configure |
| 225 | ;; Use lrelease to convert TS translation files into QM files. | 228 | ;; Use lrelease to convert TS translation files into QM files. |
| @@ -227,7 +230,9 @@ coordinates as well as partial support for adjustments in global coordinate syst | |||
| 227 | (apply invoke "lrelease" | 230 | (apply invoke "lrelease" |
| 228 | (find-files "lang" "\\.ts")) | 231 | (find-files "lang" "\\.ts")) |
| 229 | (invoke "qmake" | 232 | (invoke "qmake" |
| 230 | (string-append "PREFIX=" #$output))))))) | 233 | (string-append "PREFIX=" #$output)))) |
| 234 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 235 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 231 | (inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg)) | 236 | (inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg)) |
| 232 | (native-inputs (list qttools)) | 237 | (native-inputs (list qttools)) |
| 233 | (home-page "https://www.gpxsee.org") | 238 | (home-page "https://www.gpxsee.org") |
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ff063bd3683..961d524b4bc 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm | |||
| @@ -1149,6 +1149,9 @@ technology, such as head mounted displays with built in head tracking.") | |||
| 1149 | #:tests? #f ; doesn't have tests | 1149 | #:tests? #f ; doesn't have tests |
| 1150 | #:make-flags | 1150 | #:make-flags |
| 1151 | #~(list (string-append "INSTALL_ROOT=" #$output )) | 1151 | #~(list (string-append "INSTALL_ROOT=" #$output )) |
| 1152 | #:modules '((guix build qt-build-system) | ||
| 1153 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 1154 | (guix build utils)) | ||
| 1152 | #:phases | 1155 | #:phases |
| 1153 | #~(modify-phases %standard-phases | 1156 | #~(modify-phases %standard-phases |
| 1154 | (add-after 'unpack 'unbundle | 1157 | (add-after 'unpack 'unbundle |
| @@ -1167,7 +1170,9 @@ technology, such as head mounted displays with built in head tracking.") | |||
| 1167 | "/bin/chmod"))))) | 1170 | "/bin/chmod"))))) |
| 1168 | ;; Call qmake instead of configure to create a Makefile. | 1171 | ;; Call qmake instead of configure to create a Makefile. |
| 1169 | (replace 'configure | 1172 | (replace 'configure |
| 1170 | (lambda _ (invoke "qmake" "PREFIX=/" "OpenRGB.pro")))))) | 1173 | (lambda _ (invoke "qmake" "PREFIX=/" "OpenRGB.pro"))) |
| 1174 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 1175 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 1171 | (inputs | 1176 | (inputs |
| 1172 | (list coreutils | 1177 | (list coreutils |
| 1173 | hidapi | 1178 | hidapi |
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index f594e898d3d..3e1c30b8d78 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm | |||
| @@ -822,6 +822,9 @@ Poppler-Qt5 binding, PDF documents.") | |||
| 822 | (list | 822 | (list |
| 823 | #:qtbase qtbase | 823 | #:qtbase qtbase |
| 824 | #:tests? #f ; test code doesn't compile | 824 | #:tests? #f ; test code doesn't compile |
| 825 | #:modules '((guix build qt-build-system) | ||
| 826 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 827 | (guix build utils)) | ||
| 825 | #:phases | 828 | #:phases |
| 826 | #~(modify-phases %standard-phases | 829 | #~(modify-phases %standard-phases |
| 827 | (replace 'configure | 830 | (replace 'configure |
| @@ -836,7 +839,9 @@ Poppler-Qt5 binding, PDF documents.") | |||
| 836 | (lambda _ | 839 | (lambda _ |
| 837 | (substitute* "src/qvaboutdialog.cpp" | 840 | (substitute* "src/qvaboutdialog.cpp" |
| 838 | (("qvApp->checkUpdates\\(\\);") "") | 841 | (("qvApp->checkUpdates\\(\\);") "") |
| 839 | (("updateText\\(\\);") ""))))))) | 842 | (("updateText\\(\\);") "")))) |
| 843 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 844 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 840 | (native-inputs | 845 | (native-inputs |
| 841 | (list qttools)) | 846 | (list qttools)) |
| 842 | (inputs | 847 | (inputs |
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 6c0ab2ee7c9..f1b0001f0f7 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm | |||
| @@ -402,11 +402,15 @@ This package is part of the KDE administration module.") | |||
| 402 | (arguments | 402 | (arguments |
| 403 | (list #:qtbase qtbase | 403 | (list #:qtbase qtbase |
| 404 | #:tests? #f ;no tests | 404 | #:tests? #f ;no tests |
| 405 | #:modules '((guix build qt-build-system) | ||
| 406 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 407 | (guix build utils)) | ||
| 405 | #:phases | 408 | #:phases |
| 406 | #~(modify-phases %standard-phases | 409 | #~(modify-phases %standard-phases |
| 407 | (replace 'configure | 410 | (replace 'configure |
| 408 | (lambda _ | 411 | (lambda _ |
| 409 | (invoke "qmake" (string-append "PREFIX=" #$output)))) | 412 | (invoke "qmake" (string-append "PREFIX=" #$output)))) |
| 413 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 410 | (replace 'install | 414 | (replace 'install |
| 411 | (lambda _ | 415 | (lambda _ |
| 412 | (install-file "spectacle-ocr-screenshot" | 416 | (install-file "spectacle-ocr-screenshot" |
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 81ad799a918..8b4b3fc188b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm | |||
| @@ -8249,13 +8249,19 @@ Renoise, VCV Rack, or SuperCollider.") | |||
| 8249 | (build-system qt-build-system) | 8249 | (build-system qt-build-system) |
| 8250 | (arguments | 8250 | (arguments |
| 8251 | (list #:tests? #f ;no tests | 8251 | (list #:tests? #f ;no tests |
| 8252 | #:modules '((guix build qt-build-system) | ||
| 8253 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 8254 | (guix build utils)) | ||
| 8252 | #:phases #~(modify-phases %standard-phases | 8255 | #:phases #~(modify-phases %standard-phases |
| 8253 | (replace 'configure | 8256 | (replace 'configure |
| 8254 | (lambda _ | 8257 | (lambda _ |
| 8255 | (substitute* "samplebrain.pro" | 8258 | (substitute* "samplebrain.pro" |
| 8256 | (("\\/usr") | 8259 | (("\\/usr") |
| 8257 | #$output)) | 8260 | #$output)) |
| 8258 | (invoke "qmake")))))) | 8261 | (invoke "qmake"))) |
| 8262 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 8263 | (replace 'check (assoc-ref gnu:%standard-phases 'check)) | ||
| 8264 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 8259 | (inputs (list fftw liblo libsndfile portaudio)) | 8265 | (inputs (list fftw liblo libsndfile portaudio)) |
| 8260 | (home-page "https://thentrythis.org/projects/samplebrain/") | 8266 | (home-page "https://thentrythis.org/projects/samplebrain/") |
| 8261 | (synopsis "Sample mashing synthesizer designed by Aphex Twin") | 8267 | (synopsis "Sample mashing synthesizer designed by Aphex Twin") |
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 7e5d6acbb73..051dc6a9ac6 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm | |||
| @@ -1079,7 +1079,9 @@ key URIs using the standard otpauth:// scheme.") | |||
| 1079 | (build-system qt-build-system) | 1079 | (build-system qt-build-system) |
| 1080 | (arguments | 1080 | (arguments |
| 1081 | (list | 1081 | (list |
| 1082 | #:test-target "check" | 1082 | #:modules '((guix build qt-build-system) |
| 1083 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 1084 | (guix build utils)) | ||
| 1083 | #:phases | 1085 | #:phases |
| 1084 | #~(modify-phases %standard-phases | 1086 | #~(modify-phases %standard-phases |
| 1085 | (replace 'configure | 1087 | (replace 'configure |
| @@ -1088,9 +1090,12 @@ key URIs using the standard otpauth:// scheme.") | |||
| 1088 | "QMAKE_LRELEASE=lrelease" | 1090 | "QMAKE_LRELEASE=lrelease" |
| 1089 | "QMAKE_LUPDATE=lupdate" | 1091 | "QMAKE_LUPDATE=lupdate" |
| 1090 | (string-append "PREFIX=" #$output)))) | 1092 | (string-append "PREFIX=" #$output)))) |
| 1093 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 1094 | (replace 'check (assoc-ref gnu:%standard-phases 'check)) | ||
| 1091 | (add-before 'check 'pre-check | 1095 | (add-before 'check 'pre-check |
| 1092 | ;; Fontconfig needs a writable cache. | 1096 | ;; Fontconfig needs a writable cache. |
| 1093 | (lambda _ (setenv "HOME" "/tmp"))) | 1097 | (lambda _ (setenv "HOME" "/tmp"))) |
| 1098 | (replace 'install (assoc-ref gnu:%standard-phases 'install)) | ||
| 1094 | (add-after 'install 'install-auxilliary | 1099 | (add-after 'install 'install-auxilliary |
| 1095 | ;; Install man-page, icon and .desktop file. | 1100 | ;; Install man-page, icon and .desktop file. |
| 1096 | (lambda _ | 1101 | (lambda _ |
diff --git a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch deleted file mode 100644 index a5bee60ac27..00000000000 --- a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | Description: Fix building kiwix-desktop with libkiwix-12.1.0 | ||
| 2 | Bug: https://github.com/kiwix/kiwix-desktop/issues/964 | ||
| 3 | Origin: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 | ||
| 4 | Applied-Upstream: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 | ||
| 5 | --- | ||
| 6 | From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 | ||
| 7 | From: Matthieu Gautier <mgautier@kymeria.fr> | ||
| 8 | Date: Thu, 9 Feb 2023 09:47:47 +0100 | ||
| 9 | Subject: [PATCH] With last version of libkiwix, Downloader now return | ||
| 10 | shared_ptr<Download>. | ||
| 11 | |||
| 12 | --- | ||
| 13 | src/contentmanager.cpp | 4 ++-- | ||
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp | ||
| 17 | index c2f4ff9..d4db50a 100644 | ||
| 18 | --- a/src/contentmanager.cpp | ||
| 19 | +++ b/src/contentmanager.cpp | ||
| 20 | @@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k | ||
| 21 | return values; | ||
| 22 | } | ||
| 23 | auto& b = mp_library->getBookById(id); | ||
| 24 | - kiwix::Download* d; | ||
| 25 | + std::shared_ptr<kiwix::Download> d; | ||
| 26 | try { | ||
| 27 | d = mp_downloader->getDownload(b.getDownloadId()); | ||
| 28 | } catch(...) { | ||
| 29 | @@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id) | ||
| 30 | for (auto b : booksList) | ||
| 31 | if (b.toStdString() == book.getId()) | ||
| 32 | return ""; | ||
| 33 | - kiwix::Download *download; | ||
| 34 | + std::shared_ptr<kiwix::Download> download; | ||
| 35 | try { | ||
| 36 | std::pair<std::string, std::string> downloadDir("dir", downloadPath.toStdString()); | ||
| 37 | const std::vector<std::pair<std::string, std::string>> options = { downloadDir }; | ||
| 38 | -- | ||
| 39 | 2.41.0 | ||
| 40 | |||
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a595d8a0fc9..4c18dad6edd 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm | |||
| @@ -1066,13 +1066,18 @@ program capable of converting PDF into other formats.") | |||
| 1066 | qtsvg-5)) | 1066 | qtsvg-5)) |
| 1067 | (arguments | 1067 | (arguments |
| 1068 | (list #:tests? #f ; no tests | 1068 | (list #:tests? #f ; no tests |
| 1069 | #:modules '((guix build qt-build-system) | ||
| 1070 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 1071 | (guix build utils)) | ||
| 1069 | #:phases | 1072 | #:phases |
| 1070 | #~(modify-phases %standard-phases | 1073 | #~(modify-phases %standard-phases |
| 1071 | (replace 'configure | 1074 | (replace 'configure |
| 1072 | (lambda _ | 1075 | (lambda _ |
| 1073 | (substitute* "qpdfview.pri" | 1076 | (substitute* "qpdfview.pri" |
| 1074 | (("/usr") #$output)) | 1077 | (("/usr") #$output)) |
| 1075 | (invoke "qmake" "qpdfview.pro")))))) | 1078 | (invoke "qmake" "qpdfview.pro"))) |
| 1079 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 1080 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 1076 | (home-page "https://launchpad.net/qpdfview") | 1081 | (home-page "https://launchpad.net/qpdfview") |
| 1077 | (synopsis "Tabbed document viewer") | 1082 | (synopsis "Tabbed document viewer") |
| 1078 | (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU | 1083 | (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU |
| @@ -1853,9 +1858,12 @@ Keywords: html2pdf, htmltopdf") | |||
| 1853 | (build-system cmake-build-system) | 1858 | (build-system cmake-build-system) |
| 1854 | (arguments | 1859 | (arguments |
| 1855 | (list | 1860 | (list |
| 1861 | #:tests? #f ; no tests | ||
| 1856 | #:configure-flags | 1862 | #:configure-flags |
| 1857 | #~(list (string-append "PREFIX=" #$output)) | 1863 | #~(list (string-append "PREFIX=" #$output)) |
| 1858 | #:test-target "check" | 1864 | #:modules '((guix build cmake-build-system) |
| 1865 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 1866 | (guix build utils)) | ||
| 1859 | #:phases | 1867 | #:phases |
| 1860 | #~(modify-phases %standard-phases | 1868 | #~(modify-phases %standard-phases |
| 1861 | (add-after 'unpack 'patch-paths | 1869 | (add-after 'unpack 'patch-paths |
| @@ -1868,7 +1876,9 @@ Keywords: html2pdf, htmltopdf") | |||
| 1868 | (replace 'configure | 1876 | (replace 'configure |
| 1869 | (lambda* (#:key configure-flags #:allow-other-keys) | 1877 | (lambda* (#:key configure-flags #:allow-other-keys) |
| 1870 | (apply invoke "qmake" configure-flags))) | 1878 | (apply invoke "qmake" configure-flags))) |
| 1871 | (add-after 'install 'instal-man-page | 1879 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) |
| 1880 | (replace 'install (assoc-ref gnu:%standard-phases 'install)) | ||
| 1881 | (add-after 'install 'install-man-page | ||
| 1872 | (lambda _ | 1882 | (lambda _ |
| 1873 | (install-file "resources/sioyek.1" | 1883 | (install-file "resources/sioyek.1" |
| 1874 | (string-append #$output "/share/man/man1"))))))) | 1884 | (string-append #$output "/share/man/man1"))))))) |
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0bdd576e231..b12564da444 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm | |||
| @@ -4132,6 +4132,9 @@ instances.") | |||
| 4132 | (arguments | 4132 | (arguments |
| 4133 | (list | 4133 | (list |
| 4134 | #:qtbase qtbase | 4134 | #:qtbase qtbase |
| 4135 | #:modules '((guix build qt-build-system) | ||
| 4136 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 4137 | (guix build utils)) | ||
| 4135 | #:phases | 4138 | #:phases |
| 4136 | #~(modify-phases %standard-phases | 4139 | #~(modify-phases %standard-phases |
| 4137 | (add-after 'unpack 'fix-installation-prefix | 4140 | (add-after 'unpack 'fix-installation-prefix |
| @@ -4146,6 +4149,7 @@ instances.") | |||
| 4146 | (replace 'configure | 4149 | (replace 'configure |
| 4147 | (lambda _ | 4150 | (lambda _ |
| 4148 | (invoke "qmake"))) | 4151 | (invoke "qmake"))) |
| 4152 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 4149 | (replace 'check | 4153 | (replace 'check |
| 4150 | (lambda* (#:key tests? #:allow-other-keys) | 4154 | (lambda* (#:key tests? #:allow-other-keys) |
| 4151 | (when tests? | 4155 | (when tests? |
| @@ -5241,6 +5245,9 @@ programming paradigm.") | |||
| 5241 | (arguments | 5245 | (arguments |
| 5242 | (list #:qtbase qtbase | 5246 | (list #:qtbase qtbase |
| 5243 | #:tests? #f ;no tests | 5247 | #:tests? #f ;no tests |
| 5248 | #:modules '((guix build qt-build-system) | ||
| 5249 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 5250 | (guix build utils)) | ||
| 5244 | #:phases | 5251 | #:phases |
| 5245 | #~(modify-phases %standard-phases | 5252 | #~(modify-phases %standard-phases |
| 5246 | ;; This project does not have any build rule but its demo has | 5253 | ;; This project does not have any build rule but its demo has |
| @@ -5257,6 +5264,7 @@ programming paradigm.") | |||
| 5257 | (replace 'configure | 5264 | (replace 'configure |
| 5258 | (lambda _ | 5265 | (lambda _ |
| 5259 | (invoke "qmake"))) | 5266 | (invoke "qmake"))) |
| 5267 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 5260 | ;; No install rule exists. | 5268 | ;; No install rule exists. |
| 5261 | (replace 'install | 5269 | (replace 'install |
| 5262 | (lambda _ | 5270 | (lambda _ |
| @@ -6119,6 +6127,9 @@ a secure way."))) | |||
| 6119 | (inputs (list dbus glib libaccounts-glib)) | 6127 | (inputs (list dbus glib libaccounts-glib)) |
| 6120 | (arguments | 6128 | (arguments |
| 6121 | (list #:tests? #f ; Figure out how to run tests | 6129 | (list #:tests? #f ; Figure out how to run tests |
| 6130 | #:modules '((guix build qt-build-system) | ||
| 6131 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 6132 | (guix build utils)) | ||
| 6122 | #:phases | 6133 | #:phases |
| 6123 | #~(modify-phases %standard-phases | 6134 | #~(modify-phases %standard-phases |
| 6124 | (replace 'configure | 6135 | (replace 'configure |
| @@ -6141,7 +6152,9 @@ a secure way."))) | |||
| 6141 | (string-append "PREFIX=" #$output) | 6152 | (string-append "PREFIX=" #$output) |
| 6142 | (string-append "LIBDIR=" #$output "/lib") | 6153 | (string-append "LIBDIR=" #$output "/lib") |
| 6143 | (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," | 6154 | (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," |
| 6144 | #$output "/lib -Wl,-rpath,"))))))) | 6155 | #$output "/lib -Wl,-rpath,")))) |
| 6156 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 6157 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 6145 | (home-page "https://accounts-sso.gitlab.io/signond/index.html") | 6158 | (home-page "https://accounts-sso.gitlab.io/signond/index.html") |
| 6146 | (synopsis "Perform user authentication over D-Bus") | 6159 | (synopsis "Perform user authentication over D-Bus") |
| 6147 | (description "This package provides a D-Bus service which performs user | 6160 | (description "This package provides a D-Bus service which performs user |
| @@ -6191,6 +6204,9 @@ authentication on behalf of its clients.") | |||
| 6191 | (inputs (list signond)) | 6204 | (inputs (list signond)) |
| 6192 | (arguments | 6205 | (arguments |
| 6193 | (list #:tests? #f ;no tests | 6206 | (list #:tests? #f ;no tests |
| 6207 | #:modules '((guix build qt-build-system) | ||
| 6208 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 6209 | (guix build utils)) | ||
| 6194 | #:phases | 6210 | #:phases |
| 6195 | #~(modify-phases %standard-phases | 6211 | #~(modify-phases %standard-phases |
| 6196 | (replace 'configure | 6212 | (replace 'configure |
| @@ -6202,7 +6218,9 @@ authentication on behalf of its clients.") | |||
| 6202 | (string-append "PREFIX=" #$output) | 6218 | (string-append "PREFIX=" #$output) |
| 6203 | (string-append "LIBDIR=" #$output "/lib") | 6219 | (string-append "LIBDIR=" #$output "/lib") |
| 6204 | (string-append "SIGNON_PLUGINS_DIR=" #$output | 6220 | (string-append "SIGNON_PLUGINS_DIR=" #$output |
| 6205 | "/lib/signon"))))))) | 6221 | "/lib/signon")))) |
| 6222 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 6223 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 6206 | (synopsis "OAuth 2 plugin for signon") | 6224 | (synopsis "OAuth 2 plugin for signon") |
| 6207 | (description | 6225 | (description |
| 6208 | "This plugin for the Accounts-SSO SignOn daemon handles the OAuth | 6226 | "This plugin for the Accounts-SSO SignOn daemon handles the OAuth |
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 2f57e74a597..7b989d38f9e 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm | |||
| @@ -2288,13 +2288,19 @@ NanoVNA vector network analyzers.") | |||
| 2288 | qtbase-5 | 2288 | qtbase-5 |
| 2289 | v4l-utils)) | 2289 | v4l-utils)) |
| 2290 | (arguments | 2290 | (arguments |
| 2291 | `(#:tests? #f ; No test suite. | 2291 | (list |
| 2292 | #:phases | 2292 | #:tests? #f ; No test suite. |
| 2293 | (modify-phases %standard-phases | 2293 | #:modules '((guix build qt-build-system) |
| 2294 | (replace 'configure | 2294 | ((guix build gnu-build-system) #:prefix gnu:) |
| 2295 | (lambda* (#:key outputs #:allow-other-keys) | 2295 | (guix build utils)) |
| 2296 | (invoke "qmake" | 2296 | #:phases |
| 2297 | (string-append "PREFIX=" (assoc-ref outputs "out")))))))) | 2297 | #~(modify-phases %standard-phases |
| 2298 | (replace 'configure | ||
| 2299 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 2300 | (invoke "qmake" | ||
| 2301 | (string-append "PREFIX=" (assoc-ref outputs "out"))))) | ||
| 2302 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 2303 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 2298 | (home-page "http://users.telenet.be/on4qz/qsstv/") | 2304 | (home-page "http://users.telenet.be/on4qz/qsstv/") |
| 2299 | (synopsis "Program for receiving and transmitting SSTV and HAMDRM") | 2305 | (synopsis "Program for receiving and transmitting SSTV and HAMDRM") |
| 2300 | (description | 2306 | (description |
| @@ -2650,34 +2656,40 @@ sinks and sources.") | |||
| 2650 | speexdsp | 2656 | speexdsp |
| 2651 | zlib)) | 2657 | zlib)) |
| 2652 | (arguments | 2658 | (arguments |
| 2653 | `(#:tests? #f | 2659 | (list |
| 2654 | #:phases | 2660 | #:tests? #f |
| 2655 | (modify-phases %standard-phases | 2661 | #:modules '((guix build qt-build-system) |
| 2656 | (add-after 'unpack 'fix-paths | 2662 | ((guix build gnu-build-system) #:prefix gnu:) |
| 2657 | (lambda* (#:key inputs outputs #:allow-other-keys) | 2663 | (guix build utils)) |
| 2658 | (substitute* "dream.pro" | 2664 | #:phases |
| 2659 | (("target\\.path = /usr/bin") | 2665 | #~(modify-phases %standard-phases |
| 2660 | (string-append "target.path = " | 2666 | (add-after 'unpack 'fix-paths |
| 2661 | (assoc-ref outputs "out") "/bin")) | 2667 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 2662 | (("documentation\\.path = /usr/share/man/man1") | 2668 | (substitute* "dream.pro" |
| 2663 | (string-append "documentation.path = " | 2669 | (("target\\.path = /usr/bin") |
| 2664 | (assoc-ref outputs "out") | 2670 | (string-append "target.path = " |
| 2665 | "/share/man/man1")) | 2671 | (assoc-ref outputs "out") "/bin")) |
| 2666 | (("/usr/include/pulse") | 2672 | (("documentation\\.path = /usr/share/man/man1") |
| 2667 | (search-input-directory inputs "/include/pulse")) | 2673 | (string-append "documentation.path = " |
| 2668 | (("/usr/include/sndfile\\.h") | 2674 | (assoc-ref outputs "out") |
| 2669 | (search-input-file inputs "/include/sndfile.h")) | 2675 | "/share/man/man1")) |
| 2670 | (("/usr/include/opus") | 2676 | (("/usr/include/pulse") |
| 2671 | (search-input-directory inputs "/include/opus")) | 2677 | (search-input-directory inputs "/include/pulse")) |
| 2672 | (("/usr/include/speex") | 2678 | (("/usr/include/sndfile\\.h") |
| 2673 | (search-input-directory inputs "/include/speex")) | 2679 | (search-input-file inputs "/include/sndfile.h")) |
| 2674 | (("/usr/include/qwt") | 2680 | (("/usr/include/opus") |
| 2675 | (search-input-directory inputs "/include/qwt")) | 2681 | (search-input-directory inputs "/include/opus")) |
| 2676 | (("\\$\\$OUT_PWD/include/neaacdec\\.h") | 2682 | (("/usr/include/speex") |
| 2677 | (search-input-file inputs "/include/neaacdec.h"))))) | 2683 | (search-input-directory inputs "/include/speex")) |
| 2678 | (replace 'configure | 2684 | (("/usr/include/qwt") |
| 2679 | (lambda _ | 2685 | (search-input-directory inputs "/include/qwt")) |
| 2680 | (invoke "qmake")))))) | 2686 | (("\\$\\$OUT_PWD/include/neaacdec\\.h") |
| 2687 | (search-input-file inputs "/include/neaacdec.h"))))) | ||
| 2688 | (replace 'configure | ||
| 2689 | (lambda _ | ||
| 2690 | (invoke "qmake"))) | ||
| 2691 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 2692 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 2681 | (home-page "https://sourceforge.net/projects/drm/") | 2693 | (home-page "https://sourceforge.net/projects/drm/") |
| 2682 | (synopsis "Digital Radio Mondiale receiver") | 2694 | (synopsis "Digital Radio Mondiale receiver") |
| 2683 | (description | 2695 | (description |
| @@ -3166,6 +3178,9 @@ software-defined radio receivers.") | |||
| 3166 | (arguments | 3178 | (arguments |
| 3167 | (list | 3179 | (list |
| 3168 | #:tests? #f ; No test suite. | 3180 | #:tests? #f ; No test suite. |
| 3181 | #:modules '((guix build qt-build-system) | ||
| 3182 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 3183 | (guix build utils)) | ||
| 3169 | #:phases | 3184 | #:phases |
| 3170 | #~(modify-phases %standard-phases | 3185 | #~(modify-phases %standard-phases |
| 3171 | (add-after 'unpack 'fix-paths | 3186 | (add-after 'unpack 'fix-paths |
| @@ -3190,7 +3205,9 @@ software-defined radio receivers.") | |||
| 3190 | (chdir "build") | 3205 | (chdir "build") |
| 3191 | (invoke "qmake" | 3206 | (invoke "qmake" |
| 3192 | (string-append "PREFIX=" #$output) | 3207 | (string-append "PREFIX=" #$output) |
| 3193 | "../wfview.pro")))))) | 3208 | "../wfview.pro"))) |
| 3209 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 3210 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 3194 | (inputs | 3211 | (inputs |
| 3195 | (list eigen | 3212 | (list eigen |
| 3196 | eudev | 3213 | eudev |
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 660e170794c..0e9662047e3 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm | |||
| @@ -888,6 +888,9 @@ an unprivileged user.") | |||
| 888 | (arguments | 888 | (arguments |
| 889 | (list | 889 | (list |
| 890 | #:tests? #f ;no test suite | 890 | #:tests? #f ;no test suite |
| 891 | #:modules '((guix build qt-build-system) | ||
| 892 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 893 | (guix build utils)) | ||
| 891 | #:phases | 894 | #:phases |
| 892 | #~(modify-phases %standard-phases | 895 | #~(modify-phases %standard-phases |
| 893 | (add-after 'unpack 'patch-paths | 896 | (add-after 'unpack 'patch-paths |
| @@ -898,6 +901,8 @@ an unprivileged user.") | |||
| 898 | (replace 'configure | 901 | (replace 'configure |
| 899 | (lambda _ | 902 | (lambda _ |
| 900 | (invoke "qmake"))) | 903 | (invoke "qmake"))) |
| 904 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 905 | (replace 'install (assoc-ref gnu:%standard-phases 'install)) | ||
| 901 | (add-after 'install 'install-desktop-resources | 906 | (add-after 'install 'install-desktop-resources |
| 902 | (lambda _ | 907 | (lambda _ |
| 903 | (let ((datadir (string-append #$output "/share"))) | 908 | (let ((datadir (string-append #$output "/share"))) |
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 10205957180..047145dd63b 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm | |||
| @@ -267,6 +267,9 @@ execution, and libreadline support.") | |||
| 267 | (build-system cmake-build-system) | 267 | (build-system cmake-build-system) |
| 268 | (arguments | 268 | (arguments |
| 269 | (list | 269 | (list |
| 270 | #:modules '((guix build cmake-build-system) | ||
| 271 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 272 | (guix build utils)) | ||
| 270 | #:phases | 273 | #:phases |
| 271 | #~(modify-phases %standard-phases | 274 | #~(modify-phases %standard-phases |
| 272 | (add-after 'patch-source-shebangs 'patch-cmake-shell | 275 | (add-after 'patch-source-shebangs 'patch-cmake-shell |
| @@ -282,6 +285,10 @@ execution, and libreadline support.") | |||
| 282 | (substitute* "doc/man7/CMakeLists.txt" | 285 | (substitute* "doc/man7/CMakeLists.txt" |
| 283 | (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}") | 286 | (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}") |
| 284 | "${CMAKE_CURRENT_SOURCE_DIR}")))) | 287 | "${CMAKE_CURRENT_SOURCE_DIR}")))) |
| 288 | (replace 'check | ||
| 289 | (lambda* (#:rest args) | ||
| 290 | (apply (assoc-ref gnu:%standard-phases 'check) | ||
| 291 | #:test-target "test" args))) | ||
| 285 | (add-after 'install 'install-completions | 292 | (add-after 'install 'install-completions |
| 286 | (lambda _ | 293 | (lambda _ |
| 287 | (let ((bash-completion-install-dir | 294 | (let ((bash-completion-install-dir |
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b9a3c2222b8..c240878926e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm | |||
| @@ -77468,19 +77468,25 @@ PDF documents.") | |||
| 77468 | "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx")))) | 77468 | "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx")))) |
| 77469 | (build-system qt-build-system) | 77469 | (build-system qt-build-system) |
| 77470 | (arguments | 77470 | (arguments |
| 77471 | `(#:test-target "check" | 77471 | (list |
| 77472 | #:phases | 77472 | #:tests? #f ; no tests |
| 77473 | (modify-phases %standard-phases | 77473 | #:modules '((guix build qt-build-system) |
| 77474 | ;; Qt has its own configuration utility. | 77474 | ((guix build gnu-build-system) #:prefix gnu:) |
| 77475 | (replace 'configure | 77475 | (guix build utils)) |
| 77476 | (lambda* (#:key outputs #:allow-other-keys) | 77476 | #:phases |
| 77477 | (let ((out (assoc-ref outputs "out"))) | 77477 | #~(modify-phases %standard-phases |
| 77478 | (invoke "qmake" | 77478 | ;; Qt has its own configuration utility. |
| 77479 | (string-append "PREFIX=" out) | 77479 | (replace 'configure |
| 77480 | (string-append "DESKTOPDIR=" out "/share/applications") | 77480 | (lambda* (#:key outputs #:allow-other-keys) |
| 77481 | (string-append "ICONDIR=" out "/share/pixmaps") | 77481 | (let ((out (assoc-ref outputs "out"))) |
| 77482 | (string-append "METAINFODIR=" out "/share/metainfo") | 77482 | (invoke "qmake" |
| 77483 | "texmaker.pro"))))))) | 77483 | (string-append "PREFIX=" out) |
| 77484 | (string-append "DESKTOPDIR=" out "/share/applications") | ||
| 77485 | (string-append "ICONDIR=" out "/share/pixmaps") | ||
| 77486 | (string-append "METAINFODIR=" out "/share/metainfo") | ||
| 77487 | "texmaker.pro")))) | ||
| 77488 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 77489 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 77484 | (inputs | 77490 | (inputs |
| 77485 | (list poppler-qt5 qtbase-5 qtwayland-5 qtscript-5 zlib)) | 77491 | (list poppler-qt5 qtbase-5 qtwayland-5 qtscript-5 zlib)) |
| 77486 | (native-inputs | 77492 | (native-inputs |
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b42f45d727f..cbdb31e3fe9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm | |||
| @@ -2833,9 +2833,14 @@ projects while introducing many more.") | |||
| 2833 | (list #:tests? #false ; no tests | 2833 | (list #:tests? #false ; no tests |
| 2834 | #:make-flags #~(list (string-append "PREFIX=" #$output) | 2834 | #:make-flags #~(list (string-append "PREFIX=" #$output) |
| 2835 | (string-append "CC=" #+(cc-for-target))) | 2835 | (string-append "CC=" #+(cc-for-target))) |
| 2836 | #:modules '((guix build qt-build-system) | ||
| 2837 | ((guix build gnu-build-system) #:prefix gnu:) | ||
| 2838 | (guix build utils)) | ||
| 2836 | #:phases | 2839 | #:phases |
| 2837 | #~(modify-phases %standard-phases | 2840 | #~(modify-phases %standard-phases |
| 2838 | (delete 'configure) | 2841 | (delete 'configure) |
| 2842 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 2843 | (replace 'install (assoc-ref gnu:%standard-phases 'install)) | ||
| 2839 | (add-after 'install 'wrap-executable | 2844 | (add-after 'install 'wrap-executable |
| 2840 | (lambda* (#:key inputs outputs #:allow-other-keys) | 2845 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 2841 | (let* ((out (assoc-ref outputs "out")) | 2846 | (let* ((out (assoc-ref outputs "out")) |
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1435d2dc7c3..a9b5f732ab0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm | |||
| @@ -9602,7 +9602,7 @@ grepping the list.") | |||
| 9602 | (define-public libzim | 9602 | (define-public libzim |
| 9603 | (package | 9603 | (package |
| 9604 | (name "libzim") | 9604 | (name "libzim") |
| 9605 | (version "8.2.1") | 9605 | (version "9.3.0") |
| 9606 | (source (origin | 9606 | (source (origin |
| 9607 | (method git-fetch) | 9607 | (method git-fetch) |
| 9608 | (uri (git-reference | 9608 | (uri (git-reference |
| @@ -9610,7 +9610,7 @@ grepping the list.") | |||
| 9610 | (commit version))) | 9610 | (commit version))) |
| 9611 | (sha256 | 9611 | (sha256 |
| 9612 | (base32 | 9612 | (base32 |
| 9613 | "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f")) | 9613 | "1il1vc1hs954s3vnwhr337165dxbykvrldrvbilp5jxbkmwqb60d")) |
| 9614 | (file-name (git-file-name name version)))) | 9614 | (file-name (git-file-name name version)))) |
| 9615 | (build-system meson-build-system) | 9615 | (build-system meson-build-system) |
| 9616 | (arguments | 9616 | (arguments |
| @@ -9636,7 +9636,7 @@ for ZIM files.") | |||
| 9636 | (define-public kiwix-lib | 9636 | (define-public kiwix-lib |
| 9637 | (package | 9637 | (package |
| 9638 | (name "kiwix-lib") | 9638 | (name "kiwix-lib") |
| 9639 | (version "13.0.0") | 9639 | (version "14.0.0") |
| 9640 | (home-page "https://github.com/kiwix/kiwix-lib/") | 9640 | (home-page "https://github.com/kiwix/kiwix-lib/") |
| 9641 | (source (origin | 9641 | (source (origin |
| 9642 | (method git-fetch) | 9642 | (method git-fetch) |
| @@ -9645,7 +9645,7 @@ for ZIM files.") | |||
| 9645 | (commit version))) | 9645 | (commit version))) |
| 9646 | (sha256 | 9646 | (sha256 |
| 9647 | (base32 | 9647 | (base32 |
| 9648 | "0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w")) | 9648 | "099arjsx1wgz5jhvzn49859wh0v8n3ya33kmnqaw69h55mjvgza0")) |
| 9649 | (file-name (git-file-name name version)))) | 9649 | (file-name (git-file-name name version)))) |
| 9650 | (build-system meson-build-system) | 9650 | (build-system meson-build-system) |
| 9651 | (arguments | 9651 | (arguments |
| @@ -9681,7 +9681,7 @@ It contains the code shared by all Kiwix ports.") | |||
| 9681 | (define-public kiwix-desktop | 9681 | (define-public kiwix-desktop |
| 9682 | (package | 9682 | (package |
| 9683 | (name "kiwix-desktop") | 9683 | (name "kiwix-desktop") |
| 9684 | (version "2.3.1") | 9684 | (version "2.4.1") |
| 9685 | (source (origin | 9685 | (source (origin |
| 9686 | (method url-fetch) | 9686 | (method url-fetch) |
| 9687 | (uri (string-append | 9687 | (uri (string-append |
| @@ -9690,18 +9690,23 @@ It contains the code shared by all Kiwix ports.") | |||
| 9690 | ".tar.gz")) | 9690 | ".tar.gz")) |
| 9691 | (sha256 | 9691 | (sha256 |
| 9692 | (base32 | 9692 | (base32 |
| 9693 | "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) | 9693 | "1vkmk9j2jii7ri4lcayr0dr5b2w3dc24lyqmm3g4234834b1f4wl")))) |
| 9694 | (patches (search-patches "kiwix-desktop-newer-libkiwix.patch")))) | ||
| 9695 | (build-system qt-build-system) | 9694 | (build-system qt-build-system) |
| 9696 | (arguments | 9695 | (arguments |
| 9697 | `(#:test-target "check" | 9696 | (list |
| 9698 | #:phases | 9697 | #:tests? #f ; no tests |
| 9699 | (modify-phases %standard-phases | 9698 | #:modules '((guix build qt-build-system) |
| 9700 | (replace 'configure | 9699 | ((guix build gnu-build-system) #:prefix gnu:) |
| 9701 | (lambda* (#:key outputs #:allow-other-keys) | 9700 | (guix build utils)) |
| 9702 | (invoke "qmake" | 9701 | #:phases |
| 9703 | (string-append "PREFIX=" | 9702 | #~(modify-phases %standard-phases |
| 9704 | (assoc-ref outputs "out")))))))) | 9703 | (replace 'configure |
| 9704 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 9705 | (invoke "qmake" | ||
| 9706 | (string-append "PREFIX=" | ||
| 9707 | (assoc-ref outputs "out"))))) | ||
| 9708 | (replace 'build (assoc-ref gnu:%standard-phases 'build)) | ||
| 9709 | (replace 'install (assoc-ref gnu:%standard-phases 'install))))) | ||
| 9705 | (inputs | 9710 | (inputs |
| 9706 | (list bash-minimal | 9711 | (list bash-minimal |
| 9707 | curl | 9712 | curl |
| @@ -9730,14 +9735,14 @@ offline (such as Wikipedia), without any access to Internet.") | |||
| 9730 | (define-public kiwix-tools | 9735 | (define-public kiwix-tools |
| 9731 | (package | 9736 | (package |
| 9732 | (name "kiwix-tools") | 9737 | (name "kiwix-tools") |
| 9733 | (version "3.5.0") | 9738 | (version "3.7.0") |
| 9734 | (source (origin | 9739 | (source (origin |
| 9735 | (method url-fetch) | 9740 | (method url-fetch) |
| 9736 | (uri (string-append "https://download.kiwix.org/release/" | 9741 | (uri (string-append "https://download.kiwix.org/release/" |
| 9737 | "kiwix-tools/kiwix-tools-" version ".tar.xz")) | 9742 | "kiwix-tools/kiwix-tools-" version ".tar.xz")) |
| 9738 | (sha256 | 9743 | (sha256 |
| 9739 | (base32 | 9744 | (base32 |
| 9740 | "0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d")))) | 9745 | "032lzzgn3hicai4lx701cs6h731cs29x1h59j9gggcgrp1n4wxks")))) |
| 9741 | (build-system meson-build-system) | 9746 | (build-system meson-build-system) |
| 9742 | (inputs | 9747 | (inputs |
| 9743 | (list curl | 9748 | (list curl |
