From 8cc11f425586f9ee95f5d69237317ec351663ed3 Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Sat, 25 Oct 2014 20:11:20 -0400 Subject: [PATCH] makemkv: update to 1.8.14 --- pkgs/applications/video/makemkv/builder.sh | 4 +++- pkgs/applications/video/makemkv/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh index e4cfcf3d906..0f5f853c28d 100644 --- a/pkgs/applications/video/makemkv/builder.sh +++ b/pkgs/applications/video/makemkv/builder.sh @@ -4,6 +4,7 @@ set -x lib=" \ makemkv-oss-${ver}/out/libdriveio.so.0 \ makemkv-oss-${ver}/out/libmakemkv.so.1 \ + makemkv-oss-${ver}/out/libmmbd.so.0 \ " bin=" \ @@ -16,7 +17,8 @@ tar xzf ${src_oss} ( cd makemkv-oss-${ver} - make -f makefile.linux + ./configure --prefix=$out + make ) chmod +x ${bin} diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index bec9d85aefd..3513f76da4e 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl -, openssl, qt4, mesa, zlib +, openssl, qt4, mesa, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.8.0"; + ver = "1.8.14"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "1f465rdv5ibnh5hnfmvmlid0yyzkansjw8l1mi5qd3bc6ca4k30c"; + sha256 = "1kjxawqh6xnjcgvaqy7idg8k0g3zqrr1w5r2r3bf11pg0h1ys5l5"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "0kj1mpkzz2cvi0ibdgdzfwbh9k2jfj3ra5m3hd7iyc5ng21v4sk3"; + sha256 = "0cq3h45yyqma0kzi594dz0gbgjf3gyjcgxkiynifz3hacrbxbnd5"; }; - buildInputs = [openssl qt4 mesa zlib]; + buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] + ":" + stdenv.gcc.gcc + "/lib64";