diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2011-06-22 19:01:14 +0000 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2011-06-22 19:01:14 +0000 |
| commit | edd3c491191d5c035cec06c61aaafabba5fd59e8 (patch) | |
| tree | c7b35f2854c093d877abe87ef8df1861b775594e /pkgs | |
| parent | 2e8c66c1d3c40296d865f01c3b38dfd20ee9f52f (diff) | |
| download | nixlib-edd3c491191d5c035cec06c61aaafabba5fd59e8.tar nixlib-edd3c491191d5c035cec06c61aaafabba5fd59e8.tar.gz nixlib-edd3c491191d5c035cec06c61aaafabba5fd59e8.tar.bz2 nixlib-edd3c491191d5c035cec06c61aaafabba5fd59e8.tar.lz nixlib-edd3c491191d5c035cec06c61aaafabba5fd59e8.tar.xz nixlib-edd3c491191d5c035cec06c61aaafabba5fd59e8.tar.zst nixlib-edd3c491191d5c035cec06c61aaafabba5fd59e8.zip | |
mjpegtool 2.0.0 + more dependencies
svn path=/nixpkgs/trunk/; revision=27520
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/video/mjpegtools/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index e69d14a234b5..b70d8f4c9ba4 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, libjpeg, libX11}: +{ stdenv, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx }: -stdenv.mkDerivation { - name = "mjpegtools-1.9.0rc3"; +# TODO: +# - make dependencies optional +# - libpng-apng as alternative to libpng? +# - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no + +stdenv.mkDerivation rec { + name = "mjpegtools-2.0.0"; src = fetchurl { - url = mirror://sourceforge/mjpeg/mjpegtools-1.9.0rc3.tar.gz; - sha256 = "1xvgqzdb2rw6j4ss65k4hrzrbsl74p7k5l4qgf5dbfcw522kw7lb"; + url = "mirror://sourceforge/mjpeg/${name}.tar.gz"; + sha256 = "bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97"; }; - buildInputs = [libjpeg libX11]; - patches = [ ( fetchurl { - url = "http://bugs.gentoo.org/attachment.cgi?id=145622"; - sha256 = "0c3bdrkr0qsrd3jybzz84z9gs4bq90rvxg87ffw08149v5qjz7a1"; - name = "patch.patch"; - } ) ]; # from gentoo. Don't know why it broke. Make it compile again. + buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ]; } |