diff options
author | Florian Klink <flokli@flokli.de> | 2020-07-26 09:34:24 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-07-26 09:34:24 +0200 |
commit | ebfae82674331b785274dee363f5bd353d285a23 (patch) | |
tree | fb6386bce43097e73f8be5e5fd7f8739c2193147 | |
parent | b49e7987632e4c7ab3a093fdfc433e1826c4b9d7 (diff) | |
download | nixpkgs-ebfae82674331b785274dee363f5bd353d285a23.tar nixpkgs-ebfae82674331b785274dee363f5bd353d285a23.tar.gz nixpkgs-ebfae82674331b785274dee363f5bd353d285a23.tar.bz2 nixpkgs-ebfae82674331b785274dee363f5bd353d285a23.tar.lz nixpkgs-ebfae82674331b785274dee363f5bd353d285a23.tar.xz nixpkgs-ebfae82674331b785274dee363f5bd353d285a23.tar.zst nixpkgs-ebfae82674331b785274dee363f5bd353d285a23.zip |
nixos/yubikey-agent: add missing mkIf
This accidentially added pkgs.yubikey-agent to environment.systemPackages unconditionally.
-rw-r--r-- | nixos/modules/services/security/yubikey-agent.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index ac5d7054b2b..2972c64a364 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -41,7 +41,7 @@ in }; }; - config = { + config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; @@ -51,11 +51,10 @@ in path = [ pkgs.pinentry.${pinentryFlavor} ]; }; - environment.extraInit = optionalString cfg.enable - '' - if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then - export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" - fi - ''; + environment.extraInit = '' + if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then + export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" + fi + ''; }; } |