Format nixpkgs

flake.nix

@@ -7,7 +7,9 @@
   outputs = { self, nixpkgs, flake-utils }:
     {
       overlays.default = final: prev: {
-        rizin-unwrapped = prev.rizin;
+        rizin-unwrapped = prev.rizin.overrideAttrs (o: {
+          mesonFlags = o.mesonFlags ++ [ "-Dportable=true" ];
+        });
         rizin = self.packages.${prev.system}.rizin;
         rizinPlugins = {
           rz-ghidra = self.packages.${prev.system}.rz-ghidra;
@@ -26,6 +28,7 @@
         in
         rec {
           packages = flake-utils.lib.flattenTree {
+            rizin-unwrapped = pkgs.rizin-unwrapped;
             rizin = pkgs.callPackage ./rizin-with-plugin-support.nix { };
             rz-ghidra = pkgs.callPackage ./rz-ghidra.nix { };
             jsdec = pkgs.callPackage ./jsdec.nix { };

jsdec.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, pkg-config, cmake, ninja, openssl, rizin }: stdenv.mkDerivation {
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, cmake, ninja, openssl, rizin-unwrapped }: stdenv.mkDerivation {
   name = "jsdec";
   src = fetchFromGitHub {
     owner = "rizinorg";
@@ -10,6 +10,6 @@
     cd p
   '';
   mesonFlags = [ "-Djsc_folder=/build/source/" ];
-  buildInputs = [ rizin openssl ];
+  buildInputs = [ rizin-unwrapped openssl ];
   nativeBuildInputs = [ meson pkg-config ninja ];
 }

rizin-with-plugin-support.nix

@@ -1,27 +1,23 @@
-{ rizin-unwrapped, rizinPlugins, makeWrapper, symlinkJoin }:
+{ rizin-unwrapped, rizinPlugins, symlinkJoin }:
 let
   makeRizinPackageWithPlugins = plugins:
-    let
+    symlinkJoin
-      plugins_path = symlinkJoin {
+      {
-        name = "rizin-plugins";
+        name = "rizin";
-        paths = plugins;
+        paths = [ rizin-unwrapped ] ++ plugins;
-      };
+        postBuild = ''
-    in
+          cd $out/bin/
-    symlinkJoin {
+          for file in ./*; do
-      name = "rizin";
+            # Rizin loads plugins from a path relative to /proc/self/exe.
-      paths = [ rizin-unwrapped ];
+            # /proc/self/exe resolves symlinks so we need to copy the resulting binary.
-      buildInputs = [makeWrapper];
+            # This is obviously not ideal, but the binaries weight only a few kibibytes
-      postBuild = ''
+            # and nix can replace the copy with a hardlink automatically, via nix store optimize
-        wrapProgramArgs=()
+          
-        for plugin in ${plugins_path}/lib/rizin/plugins/*; do
+            cp --remove-destination "$(readlink "$file")" "$file"
-          wrapProgramArgs+=("--add-flags")
+          done
-          wrapProgramArgs+=("-l")
+        '';
-          wrapProgramArgs+=("--add-flags")
+      } // {
-          wrapProgramArgs+=("$plugin")
-        done
-        wrapProgram $out/bin/rizin ''${wrapProgramArgs[*]}
-      '';
-    } // {
       withPlugins = p: makeRizinPackageWithPlugins (plugins ++ (p rizinPlugins));
     };
-in makeRizinPackageWithPlugins []
+in
+makeRizinPackageWithPlugins [ ]

rz-ghidra.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, pkg-config, cmake, openssl, rizin }: stdenv.mkDerivation {
+{ lib, stdenv, fetchgit, pkg-config, cmake, openssl, rizin-unwrapped }: stdenv.mkDerivation {
   name = "rz-ghidra";
   src = fetchgit {
     url = "https://github.com/rizinorg/rz-ghidra.git";
@@ -7,6 +7,6 @@
     fetchSubmodules = true;
   };
   mesonFlags = [ "-Djsc_folder=.." ];
-  buildInputs = [ rizin cmake openssl ];
+  buildInputs = [ rizin-unwrapped cmake openssl ];
   nativeBuildInputs = [ pkg-config ];
 }