Merge pull request #4668 from titanous/makemkv

makemkv: update to 1.8.14
This commit is contained in:
lethalman 2014-10-26 19:51:12 +01:00
commit 70f5917bc1
2 changed files with 8 additions and 6 deletions

View file

@ -4,6 +4,7 @@ set -x
lib=" \ lib=" \
makemkv-oss-${ver}/out/libdriveio.so.0 \ makemkv-oss-${ver}/out/libdriveio.so.0 \
makemkv-oss-${ver}/out/libmakemkv.so.1 \ makemkv-oss-${ver}/out/libmakemkv.so.1 \
makemkv-oss-${ver}/out/libmmbd.so.0 \
" "
bin=" \ bin=" \
@ -16,7 +17,8 @@ tar xzf ${src_oss}
( (
cd makemkv-oss-${ver} cd makemkv-oss-${ver}
make -f makefile.linux ./configure --prefix=$out
make
) )
chmod +x ${bin} chmod +x ${bin}

View file

@ -1,23 +1,23 @@
{ stdenv, fetchurl { stdenv, fetchurl
, openssl, qt4, mesa, zlib , openssl, qt4, mesa, zlib, pkgconfig, libav
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "makemkv-${ver}"; name = "makemkv-${ver}";
ver = "1.8.0"; ver = "1.8.14";
builder = ./builder.sh; builder = ./builder.sh;
src_bin = fetchurl { src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "1f465rdv5ibnh5hnfmvmlid0yyzkansjw8l1mi5qd3bc6ca4k30c"; sha256 = "1kjxawqh6xnjcgvaqy7idg8k0g3zqrr1w5r2r3bf11pg0h1ys5l5";
}; };
src_oss = fetchurl { src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; 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 ] libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ]
+ ":" + stdenv.gcc.gcc + "/lib64"; + ":" + stdenv.gcc.gcc + "/lib64";