me/guix
Archived
1
0
Fork 0
Code Activity

gnu: smplayer: Remove reference to %outputs.

Browse source 
...which no longer exists in qt-build-system.

* gnu/packages/video.scm (smplayer)[arguments]: Turn into gexp.  Use #$OUTPUT
instead of %OUTPUTS.  Remove trailing #true's.
This commit is contained in:
Marius Bakke 2021-12-12 13:47:42 +01:00
parent 9896e828ca
commit 2ac8a13a6a
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gnu/packages/video.scm
View file

@ -22,7 +22,7 @@
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2018 Brendan Tildesley <mail@brendan.scot>
@ -80,6 +80,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix svn-download) #:use-module (guix svn-download)
#:use-module (guix hg-download) #:use-module (guix hg-download)
@ -2247,34 +2248,32 @@ projects while introducing many more.")
("zlib" ,zlib) ("zlib" ,zlib)
("mpv" ,mpv))) ("mpv" ,mpv)))
(arguments (arguments
`(#:tests? #false ; no tests (list #:tests? #false ; no tests
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) #:make-flags #~(list (string-append "PREFIX=" #$output)
(string-append "CC=" ,(cc-for-target)) (string-append "CC=" #+(cc-for-target))
;; A KLUDGE to turn off invoking lrelease on the ;; A KLUDGE to turn off invoking lrelease on the
;; project for now, because it fails consistently ;; project for now, because it fails consistently
;; with "WARNING: Could not find qmake spec ;; with "WARNING: Could not find qmake spec
;; 'default'". See below. ;; 'default'". See below.
"LRELEASE=true") "LRELEASE=true")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
;; Due to the above, we must run lrelease separately on each .ts file ;; Due to the above, we must run lrelease separately on each .ts file
;; (as opposed to running `lrelease-pro smplayer.pro` for the entire ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire
;; project, as the Makefile does normally without the above kludge). ;; project, as the Makefile does normally without the above kludge).
(add-after 'build 'compile-ts-files (add-after 'build 'compile-ts-files
(lambda _ (lambda _
(for-each (lambda (file) (for-each (lambda (file)
(invoke "lrelease" file)) (invoke "lrelease" file))
(find-files "./" "\\.ts$")) (find-files "./" "\\.ts$"))))
#true)) (add-after 'install 'wrap-executable
(add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))
(let* ((out (assoc-ref outputs "out")) (mpv (assoc-ref inputs "mpv")))
(mpv (assoc-ref inputs "mpv"))) (wrap-program (string-append out "/bin/smplayer")
(wrap-program (string-append out "/bin/smplayer") `("PATH" ":" prefix
`("PATH" ":" prefix ,(list (string-append mpv "/bin"))))))))))
,(list (string-append mpv "/bin")))))
#true)))))
(home-page "https://www.smplayer.info") (home-page "https://www.smplayer.info")
(synopsis "Complete front-end for MPlayer, a media player") (synopsis "Complete front-end for MPlayer, a media player")
(description "SMPlayer is a graphical user interface (GUI) for (description "SMPlayer is a graphical user interface (GUI) for