ok

Makefile

@@ -32,6 +32,6 @@ clean:
 	git clean -xdf
 
 nixify-zig-deps:
-	cd rose-zig && nix run 'github:Cloudef/zig2nix#zon2nix' -- build.zig.zon > deps.nix
+	cd rose-zig && zon2nix > deps.nix
 
 .PHONY: build-zig check test typecheck lintcheck lint clean nixify-zig-deps

flake.nix

@@ -80,6 +80,7 @@
               nodePackages.prettier
               zig
               zls
+              zon2nix
             ];
           })
         ];

rose-cli/default.nix

@@ -6,8 +6,8 @@
 , rose-watch
 }:
 
-python-pin.pkgs.buildPythonPackage {
-  pname = "rose-cli";
+python-pin.pkgs.buildPythonApplication {
+  pname = "rose";
   version = version;
   src = ./.;
   propagatedBuildInputs = [

rose-py/default.nix

@@ -11,6 +11,7 @@ python-pin.pkgs.buildPythonPackage {
   propagatedBuildInputs = [
     rose-zig
     py-deps.appdirs
+    py-deps.cffi
     py-deps.click
     py-deps.jinja2
     py-deps.mutagen

rose-zig/build.zig

@@ -9,12 +9,21 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    _ = b.addModule("rose", .{
+    const rose = b.addModule("rose", .{
         .root_source_file = b.path("rose/root.zig"),
         .target = target,
         .optimize = optimize,
         .imports = &[_]std.Build.Module.Import{
             .{ .name = "sqlite", .module = sqlite.module("sqlite") },
         },
     });
+
+    const librose = b.addSharedLibrary(.{
+        .name = "rose",
+        .root_source_file = .{ .path = "ffi/root.zig" },
+        .target = target,
+        .optimize = optimize,
+    });
+    librose.root_module.addImport("rose", rose);
+    b.installArtifact(librose);
 }

rose-zig/default.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{ callPackage
+, stdenv
 , zig
 , version
 }:
@@ -8,4 +9,7 @@ stdenv.mkDerivation {
   version = version;
   src = ./.;
   nativeBuildInputs = [ zig.hook ];
+  postPatch = ''
+    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  '';
 }

rose-zig/deps.nix

@@ -1,52 +1,13 @@
-# generated by zon2nix (https://github.com/Cloudef/zig2nix)
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
 
-{ lib, linkFarm, fetchurl, fetchgit, runCommandLocal, zig, name ? "zig-packages" }:
+{ linkFarm, fetchzip }:
 
-with builtins;
-with lib;
-
-let
-  unpackZigArtifact = { name, artifact }: runCommandLocal name {
-      nativeBuildInputs = [ zig ];
-    } ''
-      hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
-      mv "$TMPDIR/p/$hash" "$out"
-      chmod 755 "$out"
-    '';
-
-  fetchZig = { name, url, hash }: let
-    artifact = fetchurl { inherit url hash; };
-  in unpackZigArtifact { inherit name artifact; };
-
-  fetchGitZig = { name, url, hash }: let
-    parts = splitString "#" url;
-    base = elemAt parts 0;
-    rev = elemAt parts 1;
-  in fetchgit {
-    inherit name rev hash;
-    url = base;
-    deepClone = false;
-  };
-
-  fetchZigArtifact = { name, url, hash }: let
-    parts = splitString "://" url;
-    proto = elemAt parts 0;
-    path = elemAt parts 1;
-    fetcher = {
-      "git+http" = fetchGitZig { inherit name hash; url = "http://${path}"; };
-      "git+https" = fetchGitZig { inherit name hash; url = "https://${path}"; };
-      http = fetchZig { inherit name hash; url = "http://${path}"; };
-      https = fetchZig { inherit name hash; url = "https://${path}"; };
-      file = unpackZigArtifact { inherit name; artifact = /. + path; };
-    };
-  in fetcher.${proto};
-in linkFarm name [
+linkFarm "zig-packages" [
   {
     name = "1220e0961c135c5aa3af77a043dbc5890a18235a157238df0e2882fe84a8c8439c7a";
-    path = fetchZigArtifact {
-      name = "sqlite";
+    path = fetchzip {
       url = "https://github.com/vrischmann/zig-sqlite/archive/dc339b7cf3bca82a12c2169231dd247587766781.tar.gz";
-      hash = "sha256-PbWUedWBuNxA7diVAEh225b6YQA757aSvomQjUgSgRk=";
+      hash = "sha256-YouCVidJqhI5+joTSe1aSbnjVC+qVG2aIz6MyibRmQk=";
     };
   }
-]
+]