about summary refs log tree commit diff
path: root/pkgs/development/ada-modules
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2024-02-24 16:05:07 +0100
committersternenseemann <sternenseemann@systemli.org>2024-02-25 18:19:50 +0100
commit8c5a4cfa43d6d493ea12d25aca7025ce25293557 (patch)
tree43fc741aa8f112cbc533296fe30b64a135e97209 /pkgs/development/ada-modules
parent92718905bb39a0b98ad6289980f9a3fe14e88ab5 (diff)
gprbuild: prevent cross compiled gprbuild-boot being pulled in
Building a cross-compiled gprbuild-boot would obviously not succeed.
This change is kind of academic since we don't really have a working Ada
cross-compiler in nixpkgs, but helps verifying changes to the
gnatPackages infrastructure.
Diffstat (limited to 'pkgs/development/ada-modules')
-rw-r--r--pkgs/development/ada-modules/gprbuild/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix
index aad1157012634..fcb358d5fb5fd 100644
--- a/pkgs/development/ada-modules/gprbuild/default.nix
+++ b/pkgs/development/ada-modules/gprbuild/default.nix
@@ -54,7 +54,10 @@ stdenv.mkDerivation {
   # link gprconfig_kb db from gprbuild-boot into build dir,
   # the install process copies its contents to $out
   preInstall = ''
-    ln -sf ${gprbuild-boot}/share/gprconfig share/gprconfig
+    # Use PATH to discover spliced gprbuild-boot from buildPackages,
+    # since path interpolation would give us gprbuild-boot from pkgsHostTarget
+    gprbuild_boot="$(dirname "$(type -p gprbuild)")/.."
+    ln -sf "$gprbuild_boot/share/gprconfig" share/gprconfig
   '';
 
   # no need for the install script