From dba615098d3d28fdb3339e244a4aec778d269e85 Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Sun, 11 Aug 2024 20:55:24 -0700
Subject: build: move to a Cargo workspace

This is purely to let Cargo's dependency resolver do stuff for us, we do
not actually intend to build this stuff with Cargo to begin with.

Change-Id: I4c08d55595c7c27b7096375022581e1e34308a87
---
 package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'package.nix')

diff --git a/package.nix b/package.nix
index a678e3dbd..f37e177dd 100644
--- a/package.nix
+++ b/package.nix
@@ -137,6 +137,8 @@ let
     ./meson
     ./scripts/meson.build
     ./subprojects
+    # Required for meson to generate Cargo wraps
+    ./Cargo.lock
   ]);
 
   functionalTestFiles = fileset.unions [
@@ -288,7 +290,7 @@ stdenv.mkDerivation (finalAttrs: {
     BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
   };
 
-  cargoDeps = rustPlatform.importCargoLock { lockFile = ./src/lix-doc/Cargo.lock; };
+  cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
 
   preConfigure =
     lib.optionalString (!finalAttrs.dontBuild && !hostPlatform.isStatic) ''
-- 
cgit v1.2.3