pkgs/reverse-engineering/binsync/binsync.nix

@@ -65,11 +65,4 @@
   ];
 
   pythonImportsCheck = [ "binsync" ];
-
-  meta = {
-    description = "Reversing plugin for cross-decompiler collaboration, built on git";
-    homepage = "https://github.com/binsync/binsync";
-    changelog = "https://github.com/binsync/binsync/releases/tag/${src.tag}";
-    license = lib.licenses.bsd2;
-  };
 }

pkgs/reverse-engineering/binsync/libbs.nix

@@ -67,11 +67,4 @@
     "tests/test_decompilers.py"
     "tests/test_remote_ghidra.py"
   ];
-
-  meta = {
-    description = "Library for writing plugins in any decompiler: includes API lifting, common data formatting, and GUI abstraction";
-    homepage = "https://github.com/binsync/libbs";
-    changelog = "https://github.com/binsync/libbs/releases/tag/${src.tag}";
-    license = lib.licenses.bsd2;
-  };
 }

pkgs/reverse-engineering/ghidra/extensions.nix

@@ -13,7 +13,9 @@ lib.makeScope newScope (self: {
 
   findcrypt = self.callPackage ./extensions/findcrypt { };
 
-  ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension { };
+  ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension {
+    inherit ghidra;
+  };
 
   ghidra-golanganalyzerextension = self.callPackage ./extensions/ghidra-golanganalyzerextension { };
 

pkgs/reverse-engineering/ghidra/extensions/binsync/default.nix

@@ -15,7 +15,7 @@
     binsync
   ] ++ binsync.optional-dependencies.ghidra));
 in buildGhidraScripts {
-  pname = "BinSync";
+  pname = "binsync-ghidra";
   inherit (python.pkgs.binsync) version;
 
   src = runCommand "binsync-ghidra-scripts" {
@@ -37,10 +37,4 @@ in buildGhidraScripts {
       --replace-fail 'plugin_command = "binsync -s ghidra"' \
         'plugin_command = "${lib.getExe' binsync_env "binsync"} -s ghidra"'
   '';
-
-  meta = {
-    description = "Reversing plugin for cross-decompiler collaboration, built on git";
-    homepage = "https://github.com/binsync/binsync";
-    license = lib.licenses.bsd2;
-  };
 }

pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/default.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  buildGhidraExtension,
+  ghidra,
   gradle,
   fetchFromGitHub,
 }:
 let
   version = "0.5.1";
-  self = buildGhidraExtension {
+  self = ghidra.buildGhidraExtension {
     pname = "ghidra-delinker-extension";
     inherit version;
 

pkgs/reverse-engineering/ghidra/extensions/gnudisassembler/default.nix

@@ -25,7 +25,7 @@ buildGhidraExtension {
   pname = "gnudisassembler";
   version = lib.getVersion ghidra;
 
-  src = "${ghidra.lib}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_GnuDisassembler.zip";
+  src = "${ghidra}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_GnuDisassembler.zip";
 
   postPatch = ''
     ln -s ${binutils-src} binutils-${binutils-version}.tar.bz2

pkgs/reverse-engineering/ghidra/extensions/kaiju/default.nix

@@ -43,9 +43,9 @@ let
     # https://github.com/CERTCC/kaiju/blob/c9dbb55484b3d2a6abd9dfca2197cd00fb7ee3c1/build.gradle#L189
     preBuild = ''
       mkdir -p build/cmake/z3/java-bindings
-      ln -s ${lib.getOutput "java" z3_lib}/share/java/com.microsoft.z3.jar build/cmake/z3/java-bindings
+      ln -s ${lib.getOutput "lib" z3_lib}/lib/com.microsoft.z3.jar build/cmake/z3/java-bindings
       mkdir -p os/${ghidraPlatformName}
-      cp ${lib.getOutput "java" z3_lib}/lib/* os/${ghidraPlatformName}
+      cp ${lib.getOutput "lib" z3_lib}/lib/* os/${ghidraPlatformName}
     '';
 
     gradleFlags = [ "-PKAIJU_SKIP_Z3_BUILD=true" ];

pkgs/reverse-engineering/ghidra/extensions/machinelearning/default.nix

@@ -8,7 +8,7 @@ buildGhidraExtension {
   pname = "machinelearning";
   version = lib.getVersion ghidra;
 
-  src = "${ghidra.lib}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_MachineLearning.zip";
+  src = "${ghidra}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_MachineLearning.zip";
   dontUnpack = true;
 
   # Built as part ghidra

pkgs/reverse-engineering/ghidra/extensions/sleighdevtools/default.nix

@@ -9,7 +9,7 @@ buildGhidraExtension {
   pname = "sleighdevtools";
   version = lib.getVersion ghidra;
 
-  src = "${ghidra.lib}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_SleighDevTools.zip";
+  src = "${ghidra}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_SleighDevTools.zip";
   dontUnpack = true;
 
   # Built as part ghidra

pkgs/reverse-engineering/ghidra/extensions/wasm/default.nix

@@ -26,7 +26,7 @@ buildGhidraExtension {
 
     # this doesn't really compile, it compresses sinc into sla
     pushd data
-    ant -f build.xml -Dghidra.install.dir=${ghidra.lib}/lib/ghidra sleighCompile
+    ant -f build.xml -Dghidra.install.dir=${ghidra}/lib/ghidra sleighCompile
     popd
 
     runHook postConfigure