summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:40 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:40 +0000
commitcaff8b7f4ca90d8f33196df7f3bb6779ba0b4ae9 (patch)
tree100e520d85231d9e77e200b2ae0f6c39ee3c8509
parent58a2757aaa10b22076496f42ba28f505b82400c8 (diff)
mjpegtools: move defaults to package file
-rw-r--r--pkgs/tools/video/mjpegtools/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 197caca0d86c..31d26a6c72a3 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx
-, withMinimal ? false
+, withMinimal ? true
}:
# TODO:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8b96feeb5d2..6e181cc8f5c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4181,9 +4181,7 @@ in
mitmproxy = callPackage ../tools/networking/mitmproxy { };
- mjpegtools = callPackage ../tools/video/mjpegtools {
- withMinimal = true;
- };
+ mjpegtools = callPackage ../tools/video/mjpegtools { };
mjpegtoolsFull = mjpegtools.override {
withMinimal = false;