summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-03-04 06:01:18 +0000
committerGitHub <noreply@github.com>2022-03-04 06:01:18 +0000
commita6135f2c14eea1a232aa8a923829cdea7c489ac3 (patch)
tree9f89d8eef33192b88db45b3e4da35d1e9662b256 /pkgs/tools/security
parentd9f7fd19019b2250af9e4b740d873a9cab3aebd3 (diff)
parent2f6a957617a95403221fb646d27ebc760408a04c (diff)
downloadnixpkgs-a6135f2c14eea1a232aa8a923829cdea7c489ac3.tar
nixpkgs-a6135f2c14eea1a232aa8a923829cdea7c489ac3.tar.gz
nixpkgs-a6135f2c14eea1a232aa8a923829cdea7c489ac3.tar.bz2
nixpkgs-a6135f2c14eea1a232aa8a923829cdea7c489ac3.tar.lz
nixpkgs-a6135f2c14eea1a232aa8a923829cdea7c489ac3.tar.xz
nixpkgs-a6135f2c14eea1a232aa8a923829cdea7c489ac3.tar.zst
nixpkgs-a6135f2c14eea1a232aa8a923829cdea7c489ac3.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/krunner-pass/default.nix24
1 files 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";