Merge pull request #39652 from ajs124/makemkv_1_12_qt5

makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5
This commit is contained in:
xeji 2018-04-30 00:11:37 +02:00 committed by GitHub
commit 1c380fd6eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,26 +1,26 @@
{ stdenv, fetchurl
, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav
, openssl, qt5, libGLU_combined, zlib, pkgconfig, libav
}:
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
ver = "1.10.8";
ver = "1.12.2";
builder = ./builder.sh;
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29";
sha256 = "0ylybq0776am5yy064b55q0jja1q1p9dscwmn7f1p3igzv15rypj";
};
src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7";
sha256 = "063rgb88zbh4zwysyhjn4awykcnc90qgsx6d8ggm27wy849306v1";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [openssl qt4 libGLU_combined zlib libav];
buildInputs = [openssl qt5.qtbase libGLU_combined zlib libav];
libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ]
libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt5.qtbase zlib ]
+ ":" + stdenv.cc.cc + "/lib64";
meta = with stdenv.lib; {