From 955a657de4206c4270182ca6468c2dfbebd7415b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 31 Oct 2021 22:29:17 +0100 Subject: [PATCH] python39Packages.livestreamer: cleanup, remove python2 --- .../python-modules/livestreamer/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 03ab7ebd8327..66f2540bfc30 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -1,42 +1,37 @@ { lib , buildPythonPackage -, pkgs , fetchFromGitHub , isPyPy +, makeWrapper +, rtmpdump , pycrypto , requests -, singledispatch ? null -, futures ? null , isPy27 }: buildPythonPackage rec { - version = "1.12.2"; pname = "livestreamer"; + version = "1.12.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "chrippa"; repo = "livestreamer"; - rev = "v1.12.2"; + rev = "v${version}"; sha256 = "sha256-PqqyBh+oMmu7Ynly3fqx/+6mQYX+6SpI0Okj2O+YLz0="; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] - ++ lib.optionals isPy27 [ singledispatch futures ]; + propagatedBuildInputs = [ rtmpdump pycrypto requests ]; postInstall = '' - wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin + wrapProgram $out/bin/livestreamer --prefix PATH : ${lib.makeBinPath [ rtmpdump ]} ''; meta = with lib; { homepage = "http://livestreamer.tanuki.se"; - description = '' - Livestreamer is CLI program that extracts streams from various - services and pipes them into a video player of choice. - ''; + description = "Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice"; license = licenses.bsd2; maintainers = with maintainers; [ ]; };