diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-04-30 00:11:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-30 00:11:37 +0200 |
commit | 1c380fd6eb3f8041db935de2704386566cc009b3 (patch) | |
tree | 93469a4890d5a428f54abab46da09b821ce29aca /pkgs | |
parent | 146cb02542989d67f6bb11e1206562f44c0e1eec (diff) | |
parent | ba1b2ef24386d306409cbf3f95a4a57f796bc3ba (diff) |
Merge pull request #39652 from ajs124/makemkv_1_12_qt5
makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/makemkv/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index a4b08e1ce47c9..acc9c88d2ffe6 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -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; { |