diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-29 00:01:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 00:01:33 +0000 |
commit | 4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc (patch) | |
tree | 009d65e0b0351612af7de7970317a9890fdc1657 /pkgs/tools/security/yubikey-agent/default.nix | |
parent | 6fcda9f1ec27db14412a2103281b4b14f806066a (diff) | |
parent | db809100db91e97c118a70c3879307afdbf1dbb7 (diff) | |
download | nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.gz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.bz2 nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.lz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.xz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.zst nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security/yubikey-agent/default.nix')
-rw-r--r-- | pkgs/tools/security/yubikey-agent/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index baccb14faf4..fa243e4b048 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkg-config, darwin }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pkg-config, darwin }: buildGoModule rec { pname = "yubikey-agent"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "1b4522s7xkh6q74m0lprbnzg2hspg1pr9rzn94qmd06sry82d3fd"; + sha256 = "14s61jgcmpqh70jz0krrai8xg0xqhwmillxkij50vbsagpxjssk6"; }; buildInputs = @@ -27,11 +27,7 @@ buildGoModule rec { subPackages = [ "." ]; - # On macOS, there isn't a choice of pinentry program, so let's - # ensure the nixpkgs-provided one is available - postInstall = lib.optionalString stdenv.isDarwin '' - wrapProgram $out/bin/yubikey-agent --suffix PATH : $(dirname ${pinentry_mac}/${pinentry_mac.binaryPath}) - '' + lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p $out/lib/systemd/user substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" |