pyrox.dev
Merge pull request #238934 from raboof/codeql-fix-java-path
codeql: fix passing in nix JDK
authored by
Arnout Engelen
and committed by
GitHub
d02209e8
cdb48767
+7
-2
pkgs/development/tools/analysis/codeql/default.nix
+7
-2
pkgs/development/tools/analysis/codeql/default.nix
···
34
34
35
35
ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so
36
36
37
-
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java-aarch64%\${jdk17}%g' $out/codeql/codeql
38
-
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk17}%g' $out/codeql/codeql
37
+
# many of the codeql extractors use CODEQL_DIST + CODEQL_PLATFORM to
38
+
# resolve java home, so to be able to create databases, we want to make
39
+
# sure that they point somewhere sane/usable since we can not autopatch
40
+
# the codeql packaged java dist, but we DO want to patch the extractors
41
+
# as well as the builders which are ELF binaries for the most part
42
+
rm -rf $out/codeql/tools/linux64/java
43
+
ln -s ${jdk17} $out/codeql/tools/linux64/java
39
44
40
45
ln -s $out/codeql/codeql $out/bin/
41
46
'';