646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
16 lines
924 B
Diff
16 lines
924 B
Diff
diff --git a/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java b/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java
|
|
index ea12a661f0..da7779b07f 100644
|
|
--- a/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java
|
|
+++ b/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java
|
|
@@ -36,6 +36,10 @@ public class ApplicationUtilities {
|
|
*/
|
|
public static Collection<ResourceFile> findDefaultApplicationRootDirs() {
|
|
Collection<ResourceFile> applicationRootDirs = new ArrayList<>();
|
|
+ String nixGhidraHome = System.getenv("NIX_GHIDRAHOME");
|
|
+ if (nixGhidraHome != null) {
|
|
+ applicationRootDirs.add(new ResourceFile(nixGhidraHome));
|
|
+ };
|
|
ResourceFile applicationRootDir = findPrimaryApplicationRootDir();
|
|
if (applicationRootDir != null) {
|
|
applicationRootDirs.add(applicationRootDir);
|