diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
commit | f5e563e50a232492e57d609a95d96081a060ea17 (patch) | |
tree | e329bce8fcbb72eac2ab8f0176227e2e2623d475 /gnu/packages/video.scm | |
parent | 1130929acfff30b3f179e6bb949b1b7d78b85b69 (diff) | |
parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) | |
download | guix-patches-f5e563e50a232492e57d609a95d96081a060ea17.tar guix-patches-f5e563e50a232492e57d609a95d96081a060ea17.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r-- | gnu/packages/video.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index df7fd5434c..894eec4e84 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2018 Mark Meyer <mark@ofosos.org> ;;; Copyright © 2018 Gábor Boskovit <boskovits@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2019 Timo Eisenmann <eisenmann@fn.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1999,10 +2000,10 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (deprecated-package "livestreamer" streamlink)) (define-public twitchy - (let ((commit "0c0f925b9c7ff2aed4a3b0046561cb794143c398")) ;Fixes tests. + (let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag (package (name "twitchy") - (version (git-version "3.2" "1" commit)) + (version (git-version "3.4" "1" commit)) (source (origin (method git-fetch) @@ -2012,11 +2013,18 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (file-name (git-file-name name version)) (sha256 (base32 - "02aizvsr744sh8bdqvwwsmp2qpczlzn8fy76h5dyd3517n9nlcz9")))) + "0di03h1j9ipp2bbnxxlxz07v87icyg2hmnsr4s7184z5ql8kpzr7")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "twitchy/twitchy_play.py" + (("\"streamlink ") + (string-append "\"" (assoc-ref inputs "streamlink") + "/bin/streamlink "))) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) ;Needs to write to ‘$HOME’. |