From 5c73ee1a9375d225a66a4fd469fc82e59a2d7414 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Jan 2018 23:04:42 +0100 Subject: [PATCH] youtubeDL: don't double wrap executable Fixes command name detection via argv. --- pkgs/tools/misc/youtube-dl/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7a1ac3525a9..e071891fff9 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -30,15 +30,13 @@ buildPythonApplication rec { # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails - postInstall = let - packagesToBinPath = - [ atomicparsley ] - ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump - ++ optional phantomjsSupport phantomjs2; - in '' - wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" - ''; + makeWrapperArgs = let + packagesToBinPath = + [ atomicparsley ] + ++ optional ffmpegSupport ffmpeg + ++ optional rtmpSupport rtmpdump + ++ optional phantomjsSupport phantomjs2; + in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ]; # Requires network doCheck = false;