From 23fae8a8b15b07c11f8c4c7f95ae0ce191d0c86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 30 Jan 2021 10:25:38 +0100 Subject: [PATCH] fix cross compilation --- modules/sops/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/sops/default.nix b/modules/sops/default.nix index 718aebd..71c67bf 100644 --- a/modules/sops/default.nix +++ b/modules/sops/default.nix @@ -5,7 +5,6 @@ with lib; let cfg = config.sops; users = config.users.users; - sops-install-secrets = (pkgs.callPackage ../.. {}).sops-install-secrets; secretType = types.submodule ({ config, ... }: { options = { name = mkOption { @@ -81,7 +80,9 @@ let inherit (cfg) gnupgHome sshKeyPaths; }); - checkedManifest = pkgs.runCommandNoCC "checked-manifest.json" { + checkedManifest = let + sops-install-secrets = (pkgs.buildPackages.callPackage ../.. {}).sops-install-secrets; + in pkgs.runCommandNoCC "checked-manifest.json" { nativeBuildInputs = [ sops-install-secrets ]; } '' sops-install-secrets -check-mode=${if cfg.validateSopsFiles then "sopsfile" else "manifest"} ${manifest} @@ -155,7 +156,9 @@ in { message = "${sopsFile} is not in the nix store. Either add it to the nix store or set `sops.validateSopsFiles` to false"; }) (builtins.attrNames cfg.secrets); - system.activationScripts.setup-secrets = stringAfter [ "users" "groups" ] '' + system.activationScripts.setup-secrets = let + sops-install-secrets = (pkgs.callPackage ../.. {}).sops-install-secrets; + in stringAfter [ "users" "groups" ] '' echo setting up secrets... ${optionalString (cfg.gnupgHome != null) "SOPS_GPG_EXEC=${pkgs.gnupg}/bin/gpg"} ${sops-install-secrets}/bin/sops-install-secrets ${checkedManifest} '';