From 27cbc35640f72aa5546fed0a72f09e778911a22a Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Mon, 20 Mar 2023 14:45:01 -0400 Subject: [PATCH] codeql: make substitution include the aarch path Before this commit the path to the JDK was set wrong on aarch64. This was because the script just appends -aarch64 on aarch64. But this is wrong. This patch forces the script to use the nix JDK. --- pkgs/development/tools/analysis/codeql/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 20d16066f282..d1cab19d0846 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so + sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java-aarch64%\${jdk17}%g' $out/codeql/codeql sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk17}%g' $out/codeql/codeql ln -s $out/codeql/codeql $out/bin/