From 3143de97f9f0a70f2d2c4fb29fd83612fa2d6076 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 3 Mar 2022 11:25:46 +0800 Subject: [PATCH] krunner-pass: pass-otp has been deprecated --- pkgs/tools/security/krunner-pass/default.nix | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index 7904235b86a..a9f2c241d21 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -1,9 +1,17 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules -, kauth, krunner -, pass, pass-otp ? null }: +{ mkDerivation +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, extra-cmake-modules +, kauth +, krunner +, pass +}: mkDerivation rec { pname = "krunner-pass"; + # when upgrading the version, check if cmakeFlags is still needed version = "1.3.0"; src = fetchFromGitHub { @@ -13,9 +21,10 @@ mkDerivation rec { sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0"; }; - buildInputs = [ - kauth krunner - pass pass-otp + buildInputs = [ + kauth + krunner + (pass.withExtensions (p: with p; [ pass-otp ])) ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -33,6 +42,9 @@ mkDerivation rec { ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"'' ]; + # there are *lots* of pointless warnings in v1.3.0 + cmakeFlags = [ "-Wno-dev" ]; + meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; homepage = "https://github.com/akermu/krunner-pass";