From 15fbb963b6feeb6e835c633c9200a7a78b6c5f06 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 30 Aug 2022 23:49:04 -0500 Subject: gnu: ghostwriter: Update to 2.1.4 and fix wrapping. * gnu/packages/text-editors.scm (ghostwriter): Update to 2.14. [arguments]: Use gexps to fix 'wrap-executable' phase. --- gnu/packages/text-editors.scm | 47 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'gnu/packages/text-editors.scm') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 839f812733..67b579edb5 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2016 Carlo Zancanaro -;;; Copyright © 2017, 2018, 2020 Eric Bavier +;;; Copyright © 2017, 2018, 2020, 2022 Eric Bavier ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017 Nikita ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer @@ -651,7 +651,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (define-public ghostwriter (package (name "ghostwriter") - (version "2.0.2") + (version "2.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -660,7 +660,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (file-name (git-file-name name version)) (sha256 (base32 - "19cf55b86yj2b5hdazbyw4iyp6xq155243aiyg4m0vhwh0h79nwh")))) + "1w8a6vkhmdbp4kzb7aprvfni9ny47dj0vigbcnsh539dn3sp1gan")))) (build-system gnu-build-system) (native-inputs (list pkg-config qttools-5)) ; for lrelease @@ -675,27 +675,26 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (propagated-inputs ; To get native-search-path (list qtwebengine-5)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "qmake" (string-append "PREFIX=" out))))) - (add-after 'configure 'create-translations - (lambda _ - ;; `lrelease` will not overwrite, so delete existing .qm files - (for-each delete-file (find-files "translations" ".*\\.qm")) - (apply invoke "lrelease" (find-files "translations" ".*\\.ts")))) - ;; Ensure that icons are found at runtime. - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/ghostwriter") - `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/plugins/")) - '("qtsvg-5" "qtmultimedia-5")))))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" (string-append "PREFIX=" #$output)))) + (add-after 'configure 'create-translations + (lambda _ + ;; `lrelease` will not overwrite, so delete existing .qm files + (for-each delete-file (find-files "translations" ".*\\.qm")) + (apply invoke "lrelease" (find-files "translations" ".*\\.ts")))) + ;; Ensure that icons are found at runtime. + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/ghostwriter") + `("QT_PLUGIN_PATH" ":" prefix + #$(map (lambda (label) + (file-append (this-package-input label) + "/lib/qt5/plugins")) + '("qtsvg" "qtmultimedia"))))))))) (home-page "https://wereturtle.github.io/ghostwriter/") (synopsis "Write without distractions") (description -- cgit 1.4.1