From 4785ebc471efb4c8b0fb466221de0ca117841413 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 21 Apr 2016 17:12:47 +0300 Subject: [PATCH] mjpegtools: split, use minimal version by default --- pkgs/tools/video/mjpegtools/default.nix | 25 +++++++++++++++++++++++-- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 33b497fa3eb4..4aee9064d724 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx }: +{ stdenv, lib, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx +, withMinimal ? false +}: # TODO: # - make dependencies optional @@ -7,9 +9,28 @@ stdenv.mkDerivation rec { name = "mjpegtools-2.1.0"; + src = fetchurl { url = "mirror://sourceforge/mjpeg/${name}.tar.gz"; sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6"; }; - buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ]; + + buildInputs = [ libdv libjpeg libpng pkgconfig ] + ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ]; + + postPatch = '' + sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure + ''; + + enableParallelBuilding = true; + + outputs = [ "out" "lib" ]; + + meta = with stdenv.lib; { + description = "A suite of programs for processing MPEG or MJPEG video"; + homepage = http://mjpeg.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca64821e383b..5ee6c190ad44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2378,7 +2378,11 @@ in minixml = callPackage ../development/libraries/minixml { }; - mjpegtools = callPackage ../tools/video/mjpegtools { }; + mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; + + mjpegtools = self.mjpegtoolsFull.override { + withMinimal = true; + }; mkcue = callPackage ../tools/cd-dvd/mkcue { };