From 2a5bbe8d7b731365ccef0586775c44dacf1042eb Mon Sep 17 00:00:00 2001 From: chewblacka Date: Wed, 16 Aug 2023 21:30:38 +0100 Subject: get_iplayer: bugfix Bug fix for this issue on Nix-Darwin: https://github.com/NixOS/nixpkgs/issues/249578 Added myself as a maintainer (cherry picked from commit 9b0b8d7bee8cc72ad6da79d584e7c890557cd458) --- pkgs/applications/misc/get_iplayer/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index dae647f6c5d0..f42f16a6167c 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}: +{ lib, fetchFromGitHub, stdenv, shortenPerlShebang, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}: perlPackages.buildPerlPackage rec { pname = "get_iplayer"; @@ -12,7 +12,7 @@ perlPackages.buildPerlPackage rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ]; + buildInputs = [ perl ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = with perlPackages; [ HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious ]; @@ -27,13 +27,16 @@ perlPackages.buildPerlPackage rec { wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/.get_iplayer-wrapped + ''; meta = with lib; { description = "Downloads TV and radio from BBC iPlayer"; license = licenses.gpl3Plus; homepage = "https://squarepenguin.co.uk/"; platforms = platforms.all; - maintainers = with maintainers; [ rika ]; + maintainers = with maintainers; [ rika jgarcia ]; }; } -- cgit v1.2.3