1
0
Fork 0
mirror of https://github.com/Mic92/sops-nix.git synced 2024-12-15 17:50:51 +00:00

fix makeSetupHook's also for older nixos release

This commit is contained in:
Jörg Thalheim 2023-05-08 06:48:56 +02:00
parent bea992ff5e
commit b84b3177a1
2 changed files with 12 additions and 4 deletions

View file

@ -1,9 +1,13 @@
{ stdenv, makeSetupHook, gnupg, sops, nix }: { makeSetupHook, gnupg, sops, lib }:
let
# FIXME: drop after 23.05
propagatedBuildInputs = if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.05") then "deps" else "propagatedBuildInputs";
in
(makeSetupHook { (makeSetupHook {
name = "sops-import-keys-hook"; name = "sops-import-keys-hook";
substitutions = { substitutions = {
gpg = "${gnupg}/bin/gpg"; gpg = "${gnupg}/bin/gpg";
}; };
propagatedBuildInputs = [ sops gnupg ]; ${propagatedBuildInputs} = [ sops gnupg ];
} ./sops-import-keys-hook.bash) } ./sops-import-keys-hook.bash)

View file

@ -1,9 +1,13 @@
{ stdenv, makeSetupHook, gnupg, sops, nix }: { makeSetupHook, gnupg, sops, lib }:
let
# FIXME: drop after 23.05
propagatedBuildInputs = if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.05") then "deps" else "propagatedBuildInputs";
in
(makeSetupHook { (makeSetupHook {
name = "sops-pgp-hook"; name = "sops-pgp-hook";
substitutions = { substitutions = {
gpg = "${gnupg}/bin/gpg"; gpg = "${gnupg}/bin/gpg";
}; };
propagatedBuildInputs = [ sops gnupg ]; ${propagatedBuildInputs} = [ sops gnupg ];
} ./sops-pgp-hook.bash) } ./sops-pgp-hook.bash)