From 8c5a4cfa43d6d493ea12d25aca7025ce25293557 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 24 Feb 2024 16:05:07 +0100 Subject: 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. --- pkgs/development/ada-modules/gprbuild/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/ada-modules') 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 -- cgit 1.4.1