diff options
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | package.nix | 3 | ||||
| -rw-r--r-- | src/lix-doc/.gitignore (renamed from lix-doc/.gitignore) | 0 | ||||
| -rw-r--r-- | src/lix-doc/Cargo.lock (renamed from lix-doc/Cargo.lock) | 0 | ||||
| -rw-r--r-- | src/lix-doc/Cargo.toml (renamed from lix-doc/Cargo.toml) | 0 | ||||
| -rw-r--r-- | src/lix-doc/README.md (renamed from lix-doc/README.md) | 0 | ||||
| -rw-r--r-- | src/lix-doc/meson.build (renamed from lix-doc/meson.build) | 0 | ||||
| -rw-r--r-- | src/lix-doc/package.nix | 8 | ||||
| -rw-r--r-- | src/lix-doc/src/lib.rs (renamed from lix-doc/src/lib.rs) | 0 | ||||
| -rw-r--r-- | src/lix-doc/src/pprint.rs (renamed from lix-doc/src/pprint.rs) | 0 | ||||
| -rw-r--r-- | src/meson.build | 1 |
11 files changed, 10 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 4711e0087..bcf0d06bc 100644 --- a/meson.build +++ b/meson.build @@ -554,7 +554,6 @@ if is_darwin ) endif -subdir('lix-doc') subdir('src') subdir('scripts') subdir('misc') diff --git a/package.nix b/package.nix index af542cdf5..a678e3dbd 100644 --- a/package.nix +++ b/package.nix @@ -135,7 +135,6 @@ let ./meson.build ./meson.options ./meson - ./lix-doc ./scripts/meson.build ./subprojects ]); @@ -289,7 +288,7 @@ stdenv.mkDerivation (finalAttrs: { BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; }; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./lix-doc/Cargo.lock; }; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./src/lix-doc/Cargo.lock; }; preConfigure = lib.optionalString (!finalAttrs.dontBuild && !hostPlatform.isStatic) '' diff --git a/lix-doc/.gitignore b/src/lix-doc/.gitignore index c0d245929..c0d245929 100644 --- a/lix-doc/.gitignore +++ b/src/lix-doc/.gitignore diff --git a/lix-doc/Cargo.lock b/src/lix-doc/Cargo.lock index e82e138f5..e82e138f5 100644 --- a/lix-doc/Cargo.lock +++ b/src/lix-doc/Cargo.lock diff --git a/lix-doc/Cargo.toml b/src/lix-doc/Cargo.toml index 3f8ded0f7..3f8ded0f7 100644 --- a/lix-doc/Cargo.toml +++ b/src/lix-doc/Cargo.toml diff --git a/lix-doc/README.md b/src/lix-doc/README.md index 26049ebd7..26049ebd7 100644 --- a/lix-doc/README.md +++ b/src/lix-doc/README.md diff --git a/lix-doc/meson.build b/src/lix-doc/meson.build index 36a5d8ba4..36a5d8ba4 100644 --- a/lix-doc/meson.build +++ b/src/lix-doc/meson.build diff --git a/src/lix-doc/package.nix b/src/lix-doc/package.nix new file mode 100644 index 000000000..d3896e726 --- /dev/null +++ b/src/lix-doc/package.nix @@ -0,0 +1,8 @@ +{ rustPlatform, lib }: + +rustPlatform.buildRustPackage { + name = "lix-doc"; + + cargoLock.lockFile = ./Cargo.lock; + src = lib.cleanSource ./.; +} diff --git a/lix-doc/src/lib.rs b/src/lix-doc/src/lib.rs index f32b705f5..f32b705f5 100644 --- a/lix-doc/src/lib.rs +++ b/src/lix-doc/src/lib.rs diff --git a/lix-doc/src/pprint.rs b/src/lix-doc/src/pprint.rs index 2a72c4069..2a72c4069 100644 --- a/lix-doc/src/pprint.rs +++ b/src/lix-doc/src/pprint.rs diff --git a/src/meson.build b/src/meson.build index e918ae392..66fbb13ba 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,4 +1,5 @@ # Subcomponents: these link into artifacts themselves, and have interdependencies. +subdir('lix-doc') subdir('libutil') # Load-bearing order. libstore depends on libutil. |