me/guix
Archived
1
0
Fork 0
Code Activity

gnu: phockup: Update to 1.7.1.

Browse source 
* gnu/packages/image.scm (phockup): Update to 1.7.1.
[arguments]: In configure phase, substitute the more specific "'exiftool"
instead of "exiftool". Add wrap-program phase. Do not return #t from custom
phases.
[inputs]: Add python-tqdm.
This commit is contained in:
Arun Isaac 2021-10-20 01:08:08 +05:30
parent 7455a5a3ee
commit d9c7a10b3d
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/image.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017,2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017,2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -2348,7 +2348,7 @@ Wacom-style graphics tablets.")
(define-public phockup (define-public phockup
(package (package
(name "phockup") (name "phockup")
(version "1.5.9") (version "1.7.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2358,7 +2358,7 @@ Wacom-style graphics tablets.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13ajj0xch7yfqaaxbw0awxs0fz17n1rxir4gqh2wcgxjysqk1j2y")))) "0nqd89g4ppwc96gxyh9npain7ipnzj66p6n3irsvhrpi4k54h388"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:install-plan '(("src" "share/phockup/") `(#:install-plan '(("src" "share/phockup/")
@ -2368,10 +2368,10 @@ Wacom-style graphics tablets.")
(add-after 'unpack 'configure (add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* (list "src/dependency.py" "src/exif.py") (substitute* (list "src/dependency.py" "src/exif.py")
(("exiftool") (("'exiftool")
(string-append (assoc-ref inputs "perl-image-exiftool") (string-append "'"
"/bin/exiftool"))) (assoc-ref inputs "perl-image-exiftool")
#t)) "/bin/exiftool")))))
(add-before 'install 'check (add-before 'install 'check
(lambda _ (lambda _
(invoke "pytest"))) (invoke "pytest")))
@ -2380,11 +2380,18 @@ Wacom-style graphics tablets.")
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(mkdir (string-append out "/bin")) (mkdir (string-append out "/bin"))
(symlink (string-append out "/share/phockup/phockup.py") (symlink (string-append out "/share/phockup/phockup.py")
(string-append out "/bin/phockup"))) (string-append out "/bin/phockup")))))
#t))))) (add-after 'install-bin 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/phockup")
`("PYTHONPATH" prefix
,(search-path-as-string->list
(getenv "PYTHONPATH"))))))))))
(inputs (inputs
`(("perl-image-exiftool" ,perl-image-exiftool) `(("perl-image-exiftool" ,perl-image-exiftool)
("python" ,python))) ("python" ,python)
("python-tqdm" ,python-tqdm)))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest) `(("python-pytest" ,python-pytest)
("python-pytest-mock" ,python-pytest-mock))) ("python-pytest-mock" ,python-pytest-mock)))