diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-11-11 16:36:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-11 16:36:33 +0100 |
commit | 72f42787806f2089a84ddd17e7082dd3784e86d2 (patch) | |
tree | c753c650a59b4449feb6ab030d3216d24a965a8f | |
parent | 71689dd65a8e970543f9accc178bed013479ca62 (diff) | |
parent | a1d8a2393fc8b0a20773f0579ae8ae0632f4b8a7 (diff) | |
download | nixlib-72f42787806f2089a84ddd17e7082dd3784e86d2.tar nixlib-72f42787806f2089a84ddd17e7082dd3784e86d2.tar.gz nixlib-72f42787806f2089a84ddd17e7082dd3784e86d2.tar.bz2 nixlib-72f42787806f2089a84ddd17e7082dd3784e86d2.tar.lz nixlib-72f42787806f2089a84ddd17e7082dd3784e86d2.tar.xz nixlib-72f42787806f2089a84ddd17e7082dd3784e86d2.tar.zst nixlib-72f42787806f2089a84ddd17e7082dd3784e86d2.zip |
Merge pull request #31521 from DeltaEvo/master
albert: 0.12.0 -> 0.14.7
-rw-r--r-- | pkgs/applications/misc/albert/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index dd4858cfe2ad..5abd8953a443 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,25 +1,30 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtsvg, qtx11extras, muparser, cmake }: +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser, + cmake, python3 }: mkDerivation rec { name = "albert-${version}"; - version = "0.12.0"; + version = "0.14.7"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq"; + sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ qtbase qtsvg qtx11extras muparser ]; + buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 ]; enableParallelBuilding = true; + # We don't have virtualbox sdk so disable plugin + cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ]; + postPatch = '' - sed -i "/QStringList dirs = {/a \"$out/lib\"," \ - src/lib/albert/src/albert/extensionmanager.cpp + sed -i "/QStringList dirs = {/a \"$out/libs\"," \ + lib/albertcore/src/core/albert.cpp ''; preBuild = '' |