summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2016-08-30 14:36:16 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-08-30 14:36:16 +0200
commite1e96a8210cb753b8ea345146a46db3269147e72 (patch)
tree4b7ab692c025313e713c3d74ad626601944c9ff4 /pkgs/top-level
parentf254db331e8cec6f36a32e42d0ed9ef96d760f2e (diff)
downloadnixlib-e1e96a8210cb753b8ea345146a46db3269147e72.tar
nixlib-e1e96a8210cb753b8ea345146a46db3269147e72.tar.gz
nixlib-e1e96a8210cb753b8ea345146a46db3269147e72.tar.bz2
nixlib-e1e96a8210cb753b8ea345146a46db3269147e72.tar.lz
nixlib-e1e96a8210cb753b8ea345146a46db3269147e72.tar.xz
nixlib-e1e96a8210cb753b8ea345146a46db3269147e72.tar.zst
nixlib-e1e96a8210cb753b8ea345146a46db3269147e72.zip
youtube-dl: wrap with atomicparsley (#18066)
Otherwise --embed-thumbnail will crash youtube-dl while running.
Rewrite the module arguments to be semantic and not fail with null
pointer errors.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-packages.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8269287c76d..f2de10fcb868 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25188,17 +25188,10 @@ in modules // {
     };
   };
 
-  youtube-dl = callPackage ../tools/misc/youtube-dl {
-    # Release versions don't need pandoc because the formatted man page
-    # is included in the tarball.
-    pandoc = null;
-  };
+  youtube-dl = callPackage ../tools/misc/youtube-dl {};
 
   youtube-dl-light = callPackage ../tools/misc/youtube-dl {
-    # Release versions don't need pandoc because the formatted man page
-    # is included in the tarball.
-    ffmpeg = null;
-    pandoc = null;
+    ffmpegSupport = false;
   };
 
   zbase32 = buildPythonPackage (rec {