From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyLGP-0004er-Kc for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyLGO-0005dx-Lj for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyLGM-0005Z1-3j for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gyLGL-0001J8-NF for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:01 -0500 Subject: [bug#34653] [PATCH] gnu: twitchy: Update to 3.4. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:33232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyLFY-00047v-3a for guix-patches@gnu.org; Mon, 25 Feb 2019 13:45:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyLFW-0004FN-LS for guix-patches@gnu.org; Mon, 25 Feb 2019 13:45:12 -0500 Received: from mout0.freenet.de ([2001:748:100:40::2:2]:59770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyLFW-00040o-Br for guix-patches@gnu.org; Mon, 25 Feb 2019 13:45:10 -0500 Received: from [195.4.92.164] (helo=mjail1.freenet.de) by mout0.freenet.de with esmtpa (ID eisenmann@fn.de) (port 25) (Exim 4.90_1 #2) id 1gyLFP-0004IZ-El for guix-patches@gnu.org; Mon, 25 Feb 2019 19:45:03 +0100 Received: from [::1] (port=58450 helo=mjail1.freenet.de) by mjail1.freenet.de with esmtpa (ID eisenmann@fn.de) (Exim 4.90_1 #2) id 1gyLFP-00058B-E0 for guix-patches@gnu.org; Mon, 25 Feb 2019 19:45:03 +0100 Received: from sub5.freenet.de ([195.4.92.124]:46728) by mjail1.freenet.de with esmtpa (ID eisenmann@fn.de) (Exim 4.90_1 #2) id 1gyLCs-0002Cy-1D for guix-patches@gnu.org; Mon, 25 Feb 2019 19:42:26 +0100 From: Timo Eisenmann Date: Mon, 25 Feb 2019 19:38:54 +0100 Message-Id: <20190225183854.32008-1-eisenmann@fn.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34653@debbugs.gnu.org Cc: Timo Eisenmann * gnu/packages/video.scm: (twitchy): Update to 3.4. [arguments]: Add phase 'patch-paths' to substitute in the absolute path to 'streamlink'. --- gnu/packages/video.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b0c875befe..52f151bd78 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2018 Mark Meyer ;;; Copyright © 2018 Gábor Boskovit ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Timo Eisenmann ;;; ;;; 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’. -- 2.20.1