summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-02-10 01:09:34 +0100
committerGitHub <noreply@github.com>2022-02-10 01:09:34 +0100
commit467e93294d8fe88872da0c6f33564791b516d486 (patch)
tree76737bd347c16924d8728acaefd35ce592104c9e
parentee84388a17f95417d2eafdbf73ff61e0e2e9ded3 (diff)
parent1389f383e9d8df4809a8a220b1ba90cc9fd2e123 (diff)
downloadnixpkgs-467e93294d8fe88872da0c6f33564791b516d486.tar
nixpkgs-467e93294d8fe88872da0c6f33564791b516d486.tar.gz
nixpkgs-467e93294d8fe88872da0c6f33564791b516d486.tar.bz2
nixpkgs-467e93294d8fe88872da0c6f33564791b516d486.tar.lz
nixpkgs-467e93294d8fe88872da0c6f33564791b516d486.tar.xz
nixpkgs-467e93294d8fe88872da0c6f33564791b516d486.tar.zst
nixpkgs-467e93294d8fe88872da0c6f33564791b516d486.zip
Merge pull request #146613 from joshua-cooper/pinentry-bemenu
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/tools/security/pinentry-bemenu/default.nix25
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 33 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ca162d3ddba..19cdd164c40 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5462,6 +5462,12 @@
     githubId = 221929;
     name = "Jean-Baptiste Giraudeau";
   };
+  jc = {
+    name = "Josh Cooper";
+    email = "josh@cooper.is";
+    github = "joshua-cooper";
+    githubId = 35612334;
+  };
   jceb = {
     name = "jceb";
     email = "jceb@e-jc.de";
diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix
new file mode 100644
index 00000000000..afe1d03fff0
--- /dev/null
+++ b/pkgs/tools/security/pinentry-bemenu/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libassuan
+, libgpg-error, popt, bemenu }:
+
+stdenv.mkDerivation rec {
+  pname = "pinentry-bemenu";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "t-8ch";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-AFS4T7VqPga53/3rG8be9Q//6/2JJIe7+Ata33ewySg=";
+  };
+
+  nativeBuildInputs = [ meson ninja pkg-config ];
+  buildInputs = [ libassuan libgpg-error popt bemenu ];
+
+  meta = with lib; {
+    description = "Pinentry implementation based on bemenu";
+    homepage = "https://github.com/t-8ch/pinentry-bemenu";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jc ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b7456ee099..c7ff11e184f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8796,6 +8796,8 @@ with pkgs;
     xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook;
   };
 
+  pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { };
+
   pingtcp = callPackage ../tools/networking/pingtcp { };
 
   pinnwand = callPackage ../servers/pinnwand { };