diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-01 08:14:15 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-01 08:14:15 +0200 |
commit | 8fc5fb6eccf04bf8272f079408bf50d159b9c33d (patch) | |
tree | bd988e2a47ab26fb19aebc7fc7ce665ed1b2d23a /pkgs/applications/video | |
parent | f5f56bd8813c06f3896ba1e8dea8db06706bb1cb (diff) | |
parent | b8eaa5d3eb7e23628c3856e3ee4d302e6fe8ee97 (diff) | |
download | nixlib-8fc5fb6eccf04bf8272f079408bf50d159b9c33d.tar nixlib-8fc5fb6eccf04bf8272f079408bf50d159b9c33d.tar.gz nixlib-8fc5fb6eccf04bf8272f079408bf50d159b9c33d.tar.bz2 nixlib-8fc5fb6eccf04bf8272f079408bf50d159b9c33d.tar.lz nixlib-8fc5fb6eccf04bf8272f079408bf50d159b9c33d.tar.xz nixlib-8fc5fb6eccf04bf8272f079408bf50d159b9c33d.tar.zst nixlib-8fc5fb6eccf04bf8272f079408bf50d159b9c33d.zip |
Merge branch 'master' into x-updates
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c2563b5e298e..7d2eb514c94b 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -4,7 +4,6 @@ , libvorbis , file , boost -, lzo , xdg_utils , expat , wxGTK @@ -16,14 +15,14 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-6.1.0"; + name = "mkvtoolnix-6.2.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "01k5al3886cyi97kynx5hf98z5p7mb8vd2m057gbp1k10zblcb9x"; + sha256 = "0864vmdcnfwk5cb2fv1y60yvp9kqcyaqxwbvy4nsj7bzwv1iqysn"; }; - buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; + buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; configureFlags = "--with-boost-libdir=${boost}/lib"; buildPhase = '' |