JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31521 from DeltaEvo/master

Browse Source 
albert: 0.12.0 -> 0.14.7
This commit is contained in:
Frederik Rietdijk 2017-11-11 16:36:33 +01:00 committed by GitHub
commit 72f4278780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/misc/albert/default.nix
View File

@ -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 { mkDerivation rec {
name = "albert-${version}"; name = "albert-${version}";
version = "0.12.0"; version = "0.14.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "albertlauncher"; owner = "albertlauncher";
repo = "albert"; repo = "albert";
rev = "v${version}"; rev = "v${version}";
sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq"; sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ qtbase qtsvg qtx11extras muparser ]; buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 ];
enableParallelBuilding = true; enableParallelBuilding = true;
# We don't have virtualbox sdk so disable plugin
cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ];
postPatch = '' postPatch = ''
sed -i "/QStringList dirs = {/a \"$out/lib\"," \ sed -i "/QStringList dirs = {/a \"$out/libs\"," \
src/lib/albert/src/albert/extensionmanager.cpp lib/albertcore/src/core/albert.cpp
''; '';
preBuild = '' preBuild = ''