From 67d280dd2e71dca6e412b94ce63d328f408f3490 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 22 Jan 2024 22:56:00 -0800
Subject: [PATCH] factor package expression into a function

We'll need to call it repeatedly to make packages for cross.
---
 flake.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 89a4eb43..a86422c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,9 +50,8 @@
         ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include";
         ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";
       };
-    in
-    {
-      packages.default = builder pkgsHost {
+
+      package = pkgs: builder pkgs {
         src = nix-filter {
           root = ./.;
           include = [
@@ -65,11 +64,14 @@
         # This is redundant with CI
         doCheck = false;
 
-        env = env pkgsHost;
-        nativeBuildInputs = nativeBuildInputs pkgsHost;
+        env = env pkgs;
+        nativeBuildInputs = nativeBuildInputs pkgs;
 
         meta.mainProgram = cargoToml.package.name;
       };
+    in
+    {
+      packages.default = package pkgsHost;
 
       packages.oci-image =
       let