feat: inline Rizin Nix packages

Author: b1llow

README.md

@@ -38,6 +38,28 @@ rustPlatform.buildRustPackage {
 }
 ```
 
+## Nix packages
+
+The flake provides both the Rust bindings and the pinned Rizin build:
+
+```bash
+nix build .#rizin-rs
+nix build .#rizin
+```
+
+Rizin is pinned to a specific commit from its `dev` branch. Update it to the
+latest `dev` revision, including the source and Meson dependency hashes, with:
+
+```bash
+./nix/rizin/update.sh
+```
+
+Pass a full 40-character commit SHA to pin a specific revision instead:
+
+```bash
+./nix/rizin/update.sh <commit>
+```
+
 ## Usage
 
 TODO

flake.lock

@@ -4,72 +4,42 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    b = {
-      url = "github:b1llow/nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
     {
       self,
       nixpkgs,
       flake-utils,
-      b,
       ...
     }:
     flake-utils.lib.eachDefaultSystem (
       system:
       let
         pkgs = import nixpkgs { inherit system; };
         inherit (pkgs)
-          lib
           nixfmt-tree
           rustPlatform
-          pkg-config
           llvmPackages_18
           mkShell
           rust-analyzer
+          rustfmt
           cargo-watch
           ;
-        bpkgs = b.packages.${system};
-        inherit (bpkgs) rizin;
+
+        rizin = pkgs.callPackage ./nix/rizin { };
+        rizin-rs = pkgs.callPackage ./nix/rizin-rs { inherit rizin; };
 
         env = {
           LIBCLANG_PATH = "${llvmPackages_18.libclang.lib}/lib";
         };
-
-        rizin-rs = rustPlatform.buildRustPackage (
-          env
-          // rec {
-            pname = "rizin-rs";
-            version = "0.9.1";
-            src = ./.;
-            cargoLock.lockFile = ./Cargo.lock;
-
-            nativeBuildInputs = [
-              rustPlatform.bindgenHook
-              pkg-config
-            ];
-            buildInputs = [
-              rizin
-              llvmPackages_18.libclang
-            ];
-
-            doCheck = true;
-
-            preConfigure = ''
-
-            '';
-          }
-        );
       in
       {
         formatter = nixfmt-tree;
 
         packages = {
           default = rizin-rs;
-          inherit rizin-rs;
+          inherit rizin rizin-rs;
         };
 
         devShells = {
@@ -92,6 +62,7 @@
           fmt = mkShell {
             packages = [
               rustPlatform.rust.cargo
+              rustfmt
             ];
           };
         };

flake.nix

@@ -0,0 +1,27 @@
+{
+  llvmPackages_18,
+  pkg-config,
+  rizin,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "rizin-rs";
+  inherit (rizin) version;
+
+  src = ../..;
+  cargoLock.lockFile = ../../Cargo.lock;
+
+  LIBCLANG_PATH = "${llvmPackages_18.libclang.lib}/lib";
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    pkg-config
+  ];
+  buildInputs = [
+    rizin
+    llvmPackages_18.libclang
+  ];
+
+  doCheck = true;
+}

nix/rizin-rs/default.nix

@@ -0,0 +1,5 @@
+{
+  "rev": "26362e8c1888d4fec5d87068c08f313251cc64e1",
+  "srcHash": "sha256-CFDvgM4Ct5ZNsi/CnWxq9aOaAhklvkwZd8aupTLay2E=",
+  "mesonDepsHash": "sha256-MYRYrrhWbQRkHaYfSAxPMnhqxFFSb5xAHirqP8Zy2AY="
+}

nix/rizin/checksum.json

@@ -0,0 +1,82 @@
+{
+  cacert,
+  fetchFromGitHub,
+  git,
+  lib,
+  makeSetupHook,
+  meson,
+  rizin,
+  stdenvNoCC,
+}:
+
+let
+  checksums = builtins.fromJSON (builtins.readFile ./checksum.json);
+
+  src = fetchFromGitHub {
+    owner = "rizinorg";
+    repo = "rizin";
+    rev = checksums.rev;
+    hash = checksums.srcHash;
+  };
+
+  mesonDeps = stdenvNoCC.mkDerivation {
+    pname = "rizin-meson-deps";
+    version = builtins.substring 0 12 checksums.rev;
+    inherit src;
+
+    postUnpack = ''
+      rm "$sourceRoot/subprojects/sigdb.wrap"
+    '';
+
+    nativeBuildInputs = [
+      cacert
+      git
+      meson
+    ];
+
+    buildPhase = ''
+      runHook preBuild
+
+      meson subprojects download
+      find subprojects -type d -name .git -prune -exec rm -rf {} +
+      cp -r subprojects "$out"
+
+      runHook postBuild
+    '';
+
+    phases = [
+      "unpackPhase"
+      "buildPhase"
+    ];
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash = checksums.mesonDepsHash;
+  };
+
+  mesonDepsConfigHook = makeSetupHook {
+    name = "rizin-meson-deps-config-hook";
+  } ./meson-deps-config-hook.sh;
+in
+rizin.overrideAttrs (prevAttrs: {
+  version = "unstable-${builtins.substring 0 12 checksums.rev}";
+  inherit src mesonDeps;
+  patches = builtins.filter (
+    patch: builtins.baseNameOf patch != "0001-fix-compilation-with-clang.patch"
+  ) (prevAttrs.patches or [ ]);
+
+  mesonFlags = [
+    "-Dportable=true"
+    "-Dinstall_sigdb=false"
+  ];
+
+  nativeBuildInputs = (prevAttrs.nativeBuildInputs or [ ]) ++ [ mesonDepsConfigHook ];
+  buildInputs = [ ];
+
+  # nixpkgs-update: no auto update
+  passthru = {
+    inherit mesonDeps;
+    updateScript = ./update.sh;
+    skipBulkUpdate = true;
+  };
+})

nix/rizin/default.nix

@@ -0,0 +1,14 @@
+# shellcheck shell=bash
+
+mesonDepsConfigHook() {
+    if [[ -z ${mesonDeps-} ]]; then
+        echo "mesonDepsConfigHook: mesonDeps is not set" >&2
+        return 1
+    fi
+
+    rm -rf subprojects
+    cp -r "$mesonDeps" subprojects
+    chmod -R u+w subprojects
+}
+
+preConfigureHooks+=(mesonDepsConfigHook)