summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-03-23 07:20:09 +0100
committerGitHub <noreply@github.com>2017-03-23 07:20:09 +0100
commite77d1aaca2326aa5e47f0d16b590b3c1162e6c19 (patch)
treee031c62b59bdb4e9606295a82d46108392eac27a /pkgs
parentf5aebcd465926640d39d63ce6ef62ead5d4106c4 (diff)
parentbd0f070b98b87ce65baafe2007b0ef52a0bc88cd (diff)
downloadnixpkgs-e77d1aaca2326aa5e47f0d16b590b3c1162e6c19.tar
nixpkgs-e77d1aaca2326aa5e47f0d16b590b3c1162e6c19.tar.gz
nixpkgs-e77d1aaca2326aa5e47f0d16b590b3c1162e6c19.tar.bz2
nixpkgs-e77d1aaca2326aa5e47f0d16b590b3c1162e6c19.tar.lz
nixpkgs-e77d1aaca2326aa5e47f0d16b590b3c1162e6c19.tar.xz
nixpkgs-e77d1aaca2326aa5e47f0d16b590b3c1162e6c19.tar.zst
nixpkgs-e77d1aaca2326aa5e47f0d16b590b3c1162e6c19.zip
Merge pull request #24231 from ndowens/getiplayer
get_iplayer: 2.97 -> 2.99
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/get_iplayer/default.nix29
1 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index a858fefa8c2..d024b0fce99 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,9 +1,20 @@
-{stdenv, fetchurl, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
+{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
+
+with stdenv.lib;
+
 buildPerlPackage rec {
   name = "get_iplayer-${version}";
-  version = "2.97";
+  version = "2.99";
+  
+  src = fetchFromGitHub {
+    owner = "get-iplayer";
+    repo = "get_iplayer";
+    rev = "v${version}";
+    sha256 = "085bgwkjnaqp96gvd2s8qmkw69rz91si1sgzqdqbplkzj9bk2qii";
+  };
 
-  buildInputs = [makeWrapper perl];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perl ];
   propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLLibXML XMLSimple];
 
   preConfigure = "touch Makefile.PL";
@@ -13,21 +24,15 @@ buildPerlPackage rec {
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
     cp get_iplayer $out/bin
-    wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
     cp get_iplayer.1 $out/share/man/man1
   '';
-  
-  src = fetchurl {
-    url = "https://github.com/get-iplayer/get_iplayer/archive/v${version}.tar.gz";
-    sha256 = "0bb6kmzjmazwfxq5ip7yxm39vssfgz3v5vfx1114wfssp6pw0r44";
-  };
 
   meta = {
     description = "Downloads TV and radio from BBC iPlayer";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
     homepage = https://squarepenguin.co.uk/;
-    downloadPage = https://github.com/get-iplayer/get_iplayer/releases;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
   
 }