diff options
| author | Peter Hoeg <peter@speartail.com> | 2016-06-21 15:33:38 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@speartail.com> | 2016-06-21 15:33:38 +0800 |
| commit | 31a88b46647a6fd0a5098552e4bae386747c503d (patch) | |
| tree | 7a06a0b71e921fd9b3881aecd60868bfc18bca29 /pkgs/tools | |
| parent | b07051ce6c3ba3039c89b6755da279002b0c3ace (diff) | |
| download | nixpkgs-31a88b46647a6fd0a5098552e4bae386747c503d.tar nixpkgs-31a88b46647a6fd0a5098552e4bae386747c503d.tar.gz nixpkgs-31a88b46647a6fd0a5098552e4bae386747c503d.tar.bz2 nixpkgs-31a88b46647a6fd0a5098552e4bae386747c503d.tar.lz nixpkgs-31a88b46647a6fd0a5098552e4bae386747c503d.tar.xz nixpkgs-31a88b46647a6fd0a5098552e4bae386747c503d.tar.zst nixpkgs-31a88b46647a6fd0a5098552e4bae386747c503d.zip | |
togglesg-download: 2016-02-08 -> 2016-05-31
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/togglesg-download/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index 30b632f525d..14b9b1fcd9d 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, makeWrapper, ffmpeg }: +{ stdenv, lib, fetchFromGitHub, buildPythonApplication, makeWrapper, ffmpeg_3 }: buildPythonApplication rec { name = "togglesg-download-git-${version}"; - version = "2016-02-08"; + version = "2016-05-31"; src = fetchFromGitHub { owner = "0x776b7364"; repo = "toggle.sg-download"; - rev = "5cac3ec039d67ad29240b2fa850a8db595264e3d"; - sha256 = "0pqw73aa5b18d5ws4zj6gcmzap6ag526jrylqq80m0yyh9yxw5hs"; + rev = "7d7c5f4d549360f95e248accd9771949abd94ad2"; + sha256 = "0xj42khvacwmhbiy2p8rxk7lqg7pvya4zdc2c34lnr3avdp49fjn"; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,12 +20,11 @@ buildPythonApplication rec { installPhase = '' mkdir -p $out/bin - install -m755 download_toggle_video2.py $out/bin/download_toggle_video2.py + substitute $src/download_toggle_video2.py $out/bin/download_toggle_video2.py \ + --replace "ffmpeg_download_cmd = 'ffmpeg" "ffmpeg_download_cmd = '${lib.getBin ffmpeg_3}/bin/ffmpeg" + chmod 0755 $out/bin/download_toggle_video2.py ''; - postInstall = stdenv.lib.optionalString (ffmpeg != null) - ''wrapProgram $out/bin/download_toggle_video2.py --prefix PATH : "${ffmpeg}/bin"''; - meta = with stdenv.lib; { homepage = "https://github.com/0x776b7364/toggle.sg-download"; description = "Command-line tool to download videos from toggle.sg written in Python"; |