allow customizing ageBin

This commit is contained in:
Chuang Zhu 2021-12-06 07:08:18 +08:00
parent 52ea2f8c32
commit c2f6bd077c
No known key found for this signature in database
GPG key ID: C564F033729E65FD
2 changed files with 14 additions and 6 deletions

View file

@ -10,7 +10,7 @@ let
if lib.versionOlder pkgs.rage.version "0.5.0" if lib.versionOlder pkgs.rage.version "0.5.0"
then pkgs.callPackage ../pkgs/rage.nix { } then pkgs.callPackage ../pkgs/rage.nix { }
else pkgs.rage; else pkgs.rage;
ageBin = "${rage}/bin/rage"; ageBin = config.age.ageBin;
users = config.users.users; users = config.users.users;
@ -96,6 +96,13 @@ let
in in
{ {
options.age = { options.age = {
ageBin = mkOption {
type = types.str;
default = "${rage}/bin/rage";
description = ''
The age executable to use.
'';
};
secrets = mkOption { secrets = mkOption {
type = types.attrsOf secretType; type = types.attrsOf secretType;
default = { }; default = { };

View file

@ -8,13 +8,14 @@
nix, nix,
mktemp, mktemp,
diffutils, diffutils,
ageBin ? "${
# we need at least rage 0.5.0 to support ssh keys
if rage.version < "0.5.0"
then callPackage ./rage.nix {}
else rage
}/bin/rage"
} : } :
let let
# we need at least rage 0.5.0 to support ssh keys
rageToUse = if rage.version < "0.5.0"
then callPackage ./rage.nix {}
else rage;
ageBin = "${rageToUse}/bin/rage";
sedBin = "${gnused}/bin/sed"; sedBin = "${gnused}/bin/sed";
nixInstantiate = "${nix}/bin/nix-instantiate"; nixInstantiate = "${nix}/bin/nix-instantiate";
mktempBin = "${mktemp}/bin/mktemp"; mktempBin = "${mktemp}/bin/mktemp";