diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index fddfaf70f25f..598086ff3178 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -4,23 +4,26 @@ , cmake , libqalculate , muparser +, libarchive , python3Packages , qtbase , qtscxml , qtsvg +, qtdeclarative +, qt5compat , wrapQtAppsHook , nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.20.14"; + version = "0.22.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; - rev = "v${version}"; - sha256 = "sha256-c1Bp7rIloXuWv/kUzWGJJ+bh9656vpuqADy77zYZjqk="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-x5H7z0rwunfMwtihXEerc47Sdkl6IvSHfavXzXMLse0="; fetchSubmodules = true; }; @@ -31,16 +34,19 @@ stdenv.mkDerivation rec { buildInputs = [ libqalculate + libarchive muparser qtbase qtscxml qtsvg + qtdeclarative + qt5compat ] ++ (with python3Packages; [ python pybind11 ]); postPatch = '' find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; - sed -i src/nativepluginprovider.cpp \ + sed -i src/qtpluginprovider.cpp \ -e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath()," ''; @@ -50,7 +56,9 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + }; meta = with lib; { description = "A fast and flexible keyboard launcher"; @@ -60,9 +68,9 @@ stdenv.mkDerivation rec { framework. ''; homepage = "https://albertlauncher.github.io"; - changelog = "https://github.com/albertlauncher/albert/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes synthetica ]; platforms = platforms.linux; }; -} +})