diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-26 01:08:35 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-26 01:08:35 +0100 |
| commit | bff94a5a537c2c484f9f6e98cab75195c3dde9e7 (patch) | |
| tree | 56c58b40471048d57e3d8650967de47e3520418c /gnu/packages/image.scm | |
| parent | c73a7f7d86c11de6649f12b749c035fd2b6fc1d0 (diff) | |
| parent | f36bee1416ffb1ce1111168bca82e7d0313d65dc (diff) | |
| download | guix-patches-bff94a5a537c2c484f9f6e98cab75195c3dde9e7.tar guix-patches-bff94a5a537c2c484f9f6e98cab75195c3dde9e7.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index db0cb855bb..f379ad87c1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,6 +92,7 @@ #:use-module (guix build-system copy) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system scons) #:use-module (guix deprecation) #:use-module (srfi srfi-1)) @@ -1792,33 +1794,26 @@ parsing, viewing, modifying, and saving this metadata.") (define-public flameshot (package (name "flameshot") - (version "0.5.1") + (version "0.8.5") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lupoDharkael/flameshot") + (url "https://github.com/flameshot-org/flameshot") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0")))) - (build-system gnu-build-system) + "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191")))) + (build-system qt-build-system) (native-inputs `(("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "qmake" - "CONFIG+=packaging" - (string-append "BASEDIR=" (assoc-ref outputs "out")) - "PREFIX=/")))))) - (home-page "https://github.com/lupoDharkael/flameshot") + `(#:tests? #f)) ;no tests + (home-page "https://github.com/flameshot-org/flameshot") (synopsis "Powerful yet simple to use screenshot software") (description "Flameshot is a screenshot program. Features: |