diff options
| author | Peter Simons <simons@cryp.to> | 2015-03-26 11:05:38 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-03-26 11:05:38 +0100 |
| commit | 9e91fe45d67c02f3ded7d254e07951096fcbcca8 (patch) | |
| tree | 9031389f8e9fc44d66359806165dc6bc7f1aca93 /pkgs/tools | |
| parent | 46eedd9de5e21d80a4e4ae48f381a084db55c897 (diff) | |
| parent | cbfaea8191ad2922b71d199b383e6423898ab8ee (diff) | |
| download | nixlib-9e91fe45d67c02f3ded7d254e07951096fcbcca8.tar nixlib-9e91fe45d67c02f3ded7d254e07951096fcbcca8.tar.gz nixlib-9e91fe45d67c02f3ded7d254e07951096fcbcca8.tar.bz2 nixlib-9e91fe45d67c02f3ded7d254e07951096fcbcca8.tar.lz nixlib-9e91fe45d67c02f3ded7d254e07951096fcbcca8.tar.xz nixlib-9e91fe45d67c02f3ded7d254e07951096fcbcca8.tar.zst nixlib-9e91fe45d67c02f3ded7d254e07951096fcbcca8.zip | |
Merge pull request #6985 from ttuegel/youtube-dl
youtube-dl: wrap with ffmpeg
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 70618fafddfb..d6d8fa084be1 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, zip, pandoc }: +{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: let version = "2015.03.24"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1m462hcgizdp59s9h62hjwhq4vjrgmck23x2bh5jvb9vjpcfqjxv"; }; - buildInputs = [ python ]; + buildInputs = [ python makeWrapper ]; nativeBuildInputs = [ zip pandoc ]; patchPhase = '' @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) ''; + postInstall = '' + # ffmpeg is used for post-processing and fixups + wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin" + ''; + meta = { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; |