Merge https://github.com/tpwrules/nixos-apple-silicon

1 files changed, 8 insertions, 0 deletions

diff --git a/modules/nixos-apple-silicon/iso-configuration/installer-configuration.nix b/modules/nixos-apple-silicon/iso-configuration/installer-configuration.nix
index 7cd6c59a8d57..ab83bdf9e460 100644
--- a/modules/nixos-apple-silicon/iso-configuration/installer-configuration.nix
+++ b/modules/nixos-apple-silicon/iso-configuration/installer-configuration.nix
@@ -107,6 +107,14 @@
       util-linux = prev.util-linux.override {
         translateManpages = false;
       };
+
+      # fix for gnupg cross-compilation:
+      # https://github.com/NixOS/nixpkgs/pull/298001
+      gnupg = prev.gnupg.overrideAttrs (old: {
+        configureFlags = (old.configureFlags or []) ++ [
+          "GPGRT_CONFIG=${final.lib.getDev final.libgpg-error}/bin/gpgrt-config"
+        ];
+      });
     })
   ];