Author: sandervanderburg
Date: Wed Jun 29 16:21:02 2011
New Revision: 27558
URL: https://svn.nixos.org/websvn/nix/?rev=27558&sc=1
Log:
Updated kino to version 1.3.4 (and did some code standard fixes)
Modified:
nixpkgs/trunk/pkgs/applications/video/kino/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/video/kino/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/kino/default.nix Wed Jun 29
09:53:35 2011 (r27557)
+++ nixpkgs/trunk/pkgs/applications/video/kino/default.nix Wed Jun 29
16:21:02 2011 (r27558)
@@ -50,20 +50,21 @@
#AMR-WB float support no
#AMR-WB IF2 support no
+{ stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv
+, pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext
+, libX11, glib, cairo, intltool
+}:
-args: with args;
stdenv.mkDerivation {
- name = "kino-1.2.0";
-
- phases = "unpackPhase configurePhase buildPhase installPhase";
+ name = "kino-1.3.4";
src = fetchurl {
- url = http://downloads.sourceforge.net/kino/kino-1.2.0.tar.gz;
- sha256 = "15q1qmii5a2zbrrrg8iba2d1rjzaisa75zvxjhrs86jwglpn4lp9";
+ url = http://downloads.sourceforge.net/kino/kino-1.3.4.tar.gz;
+ sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i";
};
buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv
- pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext
libX11 glib cairo ]; # TODOoptional packages
+ pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv
gettext libX11 glib cairo ]; # TODOoptional packages
#preConfigure = "
# grep 11 env-vars
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jun 29 09:53:35
2011 (r27557)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jun 29 16:21:02
2011 (r27558)
@@ -6539,12 +6539,8 @@
kermit = callPackage ../tools/misc/kermit { };
- kino = import ../applications/video/kino {
- inherit fetchurl stdenv pkgconfig libxml2 perl perlXMLParser
- libdv libraw1394 libavc1394 libiec61883 x11 gettext cairo; /*
libavformat */
- inherit libsamplerate ffmpeg;
- inherit (gnome) libglade gtk glib;
- inherit (xlibs) libXv libX11;
+ kino = callPackage ../applications/video/kino {
+ inherit (gnome) libglade;
};
kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
