diff options
| author | Jade Lovelace <lix@jade.fyi> | 2024-08-11 20:55:24 -0700 |
|---|---|---|
| committer | jade <lix@jade.fyi> | 2024-08-21 17:09:10 +0000 |
| commit | dba615098d3d28fdb3339e244a4aec778d269e85 (patch) | |
| tree | 9764c3e73c9aa818a7793b087382b7cc3999f4e0 /package.nix | |
| parent | e38410799b5b78b2fc2b0c9e4b1dc0dfc5801097 (diff) | |
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
Diffstat (limited to 'package.nix')
| -rw-r--r-- | package.nix | 4 |
1 files changed, 3 insertions, 1 deletions
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) '' |