diff --git a/pkgs/reverse-engineering/ghidra/extensions.nix b/pkgs/reverse-engineering/ghidra/extensions.nix
index bc98b77..35665c4 100644
--- a/pkgs/reverse-engineering/ghidra/extensions.nix
+++ b/pkgs/reverse-engineering/ghidra/extensions.nix
@@ -13,9 +13,7 @@ lib.makeScope newScope (self: {
 
   findcrypt = self.callPackage ./extensions/findcrypt { };
 
-  ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension {
-    inherit ghidra;
-  };
+  ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension { };
 
   ghidra-golanganalyzerextension = self.callPackage ./extensions/ghidra-golanganalyzerextension { };
 
diff --git a/pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/default.nix
index 6d94bc2..b3bd47e 100644
--- a/pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/default.nix
+++ b/pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  ghidra,
+  buildGhidraExtension,
   gradle,
   fetchFromGitHub,
 }:
-ghidra.buildGhidraExtension (finalAttrs: {
+buildGhidraExtension (finalAttrs: {
   pname = "ghidra-delinker-extension";
   version = "0.5.1";
 
diff --git a/pkgs/reverse-engineering/ghidra/extensions/gnudisassembler/default.nix b/pkgs/reverse-engineering/ghidra/extensions/gnudisassembler/default.nix
index 07c0498..84638bc 100644
--- a/pkgs/reverse-engineering/ghidra/extensions/gnudisassembler/default.nix
+++ b/pkgs/reverse-engineering/ghidra/extensions/gnudisassembler/default.nix
@@ -25,7 +25,7 @@ buildGhidraExtension {
   pname = "gnudisassembler";
   version = lib.getVersion ghidra;
 
-  src = "${ghidra}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_GnuDisassembler.zip";
+  src = "${ghidra.lib}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_GnuDisassembler.zip";
 
   postPatch = ''
     ln -s ${binutils-src} binutils-${binutils-version}.tar.bz2
diff --git a/pkgs/reverse-engineering/ghidra/extensions/machinelearning/default.nix b/pkgs/reverse-engineering/ghidra/extensions/machinelearning/default.nix
index a34845d..f835c9d 100644
--- a/pkgs/reverse-engineering/ghidra/extensions/machinelearning/default.nix
+++ b/pkgs/reverse-engineering/ghidra/extensions/machinelearning/default.nix
@@ -8,7 +8,7 @@ buildGhidraExtension {
   pname = "machinelearning";
   version = lib.getVersion ghidra;
 
-  src = "${ghidra}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_MachineLearning.zip";
+  src = "${ghidra.lib}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_MachineLearning.zip";
   dontUnpack = true;
 
   # Built as part ghidra
diff --git a/pkgs/reverse-engineering/ghidra/extensions/sleighdevtools/default.nix b/pkgs/reverse-engineering/ghidra/extensions/sleighdevtools/default.nix
index 90a4954..f5784d2 100644
--- a/pkgs/reverse-engineering/ghidra/extensions/sleighdevtools/default.nix
+++ b/pkgs/reverse-engineering/ghidra/extensions/sleighdevtools/default.nix
@@ -9,7 +9,7 @@ buildGhidraExtension {
   pname = "sleighdevtools";
   version = lib.getVersion ghidra;
 
-  src = "${ghidra}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_SleighDevTools.zip";
+  src = "${ghidra.lib}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_SleighDevTools.zip";
   dontUnpack = true;
 
   # Built as part ghidra
diff --git a/pkgs/reverse-engineering/ghidra/extensions/wasm/default.nix b/pkgs/reverse-engineering/ghidra/extensions/wasm/default.nix
index d34e710..8f03b73 100644
--- a/pkgs/reverse-engineering/ghidra/extensions/wasm/default.nix
+++ b/pkgs/reverse-engineering/ghidra/extensions/wasm/default.nix
@@ -23,7 +23,7 @@ buildGhidraExtension (finalAttrs: {
 
     # this doesn't really compile, it compresses sinc into sla
     pushd data
-    ant -f build.xml -Dghidra.install.dir=${ghidra}/lib/ghidra sleighCompile
+    ant -f build.xml -Dghidra.install.dir=${ghidra.lib}/lib/ghidra sleighCompile
     popd
 
     runHook postConfigure