diff --git a/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch b/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch new file mode 100644 index 0000000000000..2d1e9f77bf959 --- /dev/null +++ b/pkgs/tools/security/ghidra/0004-Fix-build-on-Gradle-8.12.patch @@ -0,0 +1,13 @@ +diff --git a/gradle/hasPythonPackage.gradle b/gradle/hasPythonPackage.gradle +index 2d83cf0cd3..8f3205f9ff 100644 +--- a/gradle/hasPythonPackage.gradle ++++ b/gradle/hasPythonPackage.gradle +@@ -44,7 +44,7 @@ task buildPyPackage { + doLast { + File setuptools = project(":Debugger-rmi-trace").findPyDep(".") + exec { +- workingDir { "build/pypkg" } ++ workingDir { file("build/pypkg") } + commandLine rootProject.PYTHON3, "-m", "pip" + args "wheel", "-w", "dist/", "--no-index", "--no-deps" + args "-f", setuptools diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 8396db783a021..e079283c91622 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -52,6 +52,10 @@ let # Remove build dates from output filenames for easier reference ./0003-Remove-build-datestamp.patch + + # Fix build on Gradle 8.12 + # Upstream: https://github.com/NationalSecurityAgency/ghidra/commit/20285e267d110cfa585676dfd40804a59031598b + ./0004-Fix-build-on-Gradle-8.12.patch ]; postPatch = ''