about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Watson <twatson52@icloud.com>2024-03-24 18:43:11 -0500
committerThomas Watson <twatson52@icloud.com>2024-03-24 18:43:32 -0500
commit7e3e9e7ee94c24082367b951109795944a3cc1c5 (patch)
tree9953b899952d24f8395972de28047259a4cfbcdd
parent10678172a34a3ba31f5a5919d950f5ac14c1fe30 (diff)
downloadnixlib-7e3e9e7ee94c24082367b951109795944a3cc1c5.tar
nixlib-7e3e9e7ee94c24082367b951109795944a3cc1c5.tar.gz
nixlib-7e3e9e7ee94c24082367b951109795944a3cc1c5.tar.bz2
nixlib-7e3e9e7ee94c24082367b951109795944a3cc1c5.tar.lz
nixlib-7e3e9e7ee94c24082367b951109795944a3cc1c5.tar.xz
nixlib-7e3e9e7ee94c24082367b951109795944a3cc1c5.tar.zst
nixlib-7e3e9e7ee94c24082367b951109795944a3cc1c5.zip
installer: fix gnupg cross compilation
-rw-r--r--iso-configuration/installer-configuration.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/iso-configuration/installer-configuration.nix b/iso-configuration/installer-configuration.nix
index 7cd6c59a8d57..ab83bdf9e460 100644
--- a/iso-configuration/installer-configuration.nix
+++ b/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"
+        ];
+      });
     })
   ];