From bfb898bc7cba02d0758aa4aca34e25075cbe2faf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Dec 2022 13:39:08 +0100 Subject: [PATCH] mediaelch: split qt5/6 --- pkgs/applications/misc/mediaelch/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 295cab9ca160..582d3186eaad 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -10,7 +10,7 @@ , ffmpeg , libmediainfo , libzen -, qt5compat +, qt5compat ? null # qt6 only , qtbase , qtdeclarative , qtmultimedia @@ -18,7 +18,9 @@ , qtwayland , quazip }: - +let + qtVersion = lib.versions.major qtbase.version; +in stdenv.mkDerivation rec { pname = "mediaelch"; version = "2.8.18"; @@ -42,20 +44,21 @@ stdenv.mkDerivation rec { ffmpeg libmediainfo libzen - qt5compat qtbase qtdeclarative qtmultimedia qtsvg qtwayland quazip + ] ++ lib.optional (qtVersion == "6") [ + qt5compat ]; cmakeFlags = [ "-DDISABLE_UPDATER=ON" "-DUSE_EXTERN_QUAZIP=ON" - "-DMEDIAELCH_FORCE_QT6=ON" + "-DMEDIAELCH_FORCE_QT${qtVersion}=ON" ]; # libmediainfo.so.0 is loaded dynamically diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbdd7ec18e55..146890c84cfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30555,7 +30555,9 @@ with pkgs; media-downloader = callPackage ../applications/video/media-downloader { }; - mediaelch = qt6Packages.callPackage ../applications/misc/mediaelch { }; + mediaelch = mediaelch-qt5; + mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; + mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; mediainfo = callPackage ../applications/misc/mediainfo { };