Merge pull request #60829 from peterhoeg/f/krunner_pass
krunner-pass: fix the build
This commit is contained in:
commit
4c56c1ce9e
|
@ -1,15 +1,10 @@
|
||||||
{ mkDerivation, stdenv,
|
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules
|
||||||
fetchFromGitHub,
|
, kauth, krunner
|
||||||
cmake, extra-cmake-modules, gnumake,
|
, pass, pass-otp ? null }:
|
||||||
|
|
||||||
pass, pass-otp ? null, krunner,
|
mkDerivation rec {
|
||||||
}:
|
|
||||||
let
|
|
||||||
pname = "krunner-pass";
|
pname = "krunner-pass";
|
||||||
version = "1.3.0";
|
version = "1.3.0";
|
||||||
in
|
|
||||||
mkDerivation rec {
|
|
||||||
name = "${pname}-${version}";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akermu";
|
owner = "akermu";
|
||||||
|
@ -19,22 +14,26 @@ mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pass
|
kauth krunner
|
||||||
pass-otp
|
pass pass-otp
|
||||||
krunner
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [cmake extra-cmake-modules gnumake];
|
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch;
|
||||||
|
sha256 = "098dqnal57994p51p2srfzg4lgcd6ybp29h037llr9cdv02hdxvl";
|
||||||
|
name = "fix_build.patch";
|
||||||
|
})
|
||||||
./pass-path.patch
|
./pass-path.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
CXXFLAGS = [
|
CXXFLAGS = [
|
||||||
''-DNIXPKGS_PASS=\"${stdenv.lib.getBin pass}/bin/pass\"''
|
''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"''
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)";
|
description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)";
|
||||||
homepage = https://github.com/akermu/krunner-pass;
|
homepage = https://github.com/akermu/krunner-pass;
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
|
|
Loading…
Reference in New Issue