diff --git a/pkgs/applications/video/memento/default.nix b/pkgs/applications/video/memento/default.nix index 40ff061a7fea..cb5ad398ff09 100644 --- a/pkgs/applications/video/memento/default.nix +++ b/pkgs/applications/video/memento/default.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, qtx11extras ? null # qt5 only +, qt6 , wrapQtAppsHook # before that => zeal @@ -15,37 +14,34 @@ , yt-dlp # optional , makeWrapper}: - -let - isQt5 = lib.versions.major qtbase.version == "5"; - -in stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-55VvT7pHN0/HqxM4vMDQDgUwkVmO/8aOEOye8jcFzgI="; + hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk="; }; nativeBuildInputs = [ cmake makeWrapper + qt6.qtbase + qt6.qtsvg + qt6.qtwayland wrapQtAppsHook ]; buildInputs = [ - qtbase sqlite json_c libzip mecab - ] ++ lib.optionals isQt5 [ qtx11extras ]; + ]; - propagatedBuildInputs = [ mpv ]; + propagatedBuildInputs = [ mpv ]; preFixup = '' wrapProgram "$out/bin/memento" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2ca8a3cad29..28e7ea12bc5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32782,7 +32782,7 @@ with pkgs; mailspring = callPackage ../applications/networking/mailreaders/mailspring { }; - memento = libsForQt5.callPackage ../applications/video/memento { }; + memento = qt6Packages.callPackage ../applications/video/memento { }; mm = callPackage ../applications/networking/instant-messengers/mm { };