diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 2db12da25758..295cab9ca160 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,22 +1,25 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub -, qmake +, cmake , qttools +, wrapQtAppsHook , curl , ffmpeg , libmediainfo , libzen +, qt5compat , qtbase , qtdeclarative , qtmultimedia , qtsvg +, qtwayland , quazip }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mediaelch"; version = "2.8.18"; @@ -28,20 +31,35 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake qttools ]; - - buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ]; - - qmakeFlags = [ - "USE_EXTERN_QUAZIP=${quazip}/include/quazip5" + nativeBuildInputs = [ + cmake + qttools + wrapQtAppsHook ]; - postPatch = '' - substituteInPlace MediaElch.pro --replace "/usr" "$out" - ''; + buildInputs = [ + curl + ffmpeg + libmediainfo + libzen + qt5compat + qtbase + qtdeclarative + qtmultimedia + qtsvg + qtwayland + quazip + ]; + + cmakeFlags = [ + "-DDISABLE_UPDATER=ON" + "-DUSE_EXTERN_QUAZIP=ON" + "-DMEDIAELCH_FORCE_QT6=ON" + ]; + + # libmediainfo.so.0 is loaded dynamically qtWrapperArgs = [ - # libmediainfo.so.0 is loaded dynamically "--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6246647a2c1d..bbdd7ec18e55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30555,7 +30555,7 @@ with pkgs; media-downloader = callPackage ../applications/video/media-downloader { }; - mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { }; + mediaelch = qt6Packages.callPackage ../applications/misc/mediaelch { }; mediainfo = callPackage ../applications/misc/mediainfo { };