Skip to content

Commit

Permalink
codeql: make substitution include the aarch path
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Max Ammann committed Mar 20, 2023
1 parent 8d86d5b commit 27cbc35
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pkgs/development/tools/analysis/codeql/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit 27cbc35

Please sign in to comment.