lix-doc: move under src/
This is required to make more meson stuff easier/possible, and honestly it *is* now Lix sources anyhow. Change-Id: Ia6c38fabce9aa5c53768745ee38c5cf344f5c226
This commit is contained in:
parent
95863b258b
commit
736b5d5913
11 changed files with 10 additions and 3 deletions
|
@ -554,7 +554,6 @@ if is_darwin
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
subdir('lix-doc')
|
|
||||||
subdir('src')
|
subdir('src')
|
||||||
subdir('scripts')
|
subdir('scripts')
|
||||||
subdir('misc')
|
subdir('misc')
|
||||||
|
|
|
@ -135,7 +135,6 @@ let
|
||||||
./meson.build
|
./meson.build
|
||||||
./meson.options
|
./meson.options
|
||||||
./meson
|
./meson
|
||||||
./lix-doc
|
|
||||||
./scripts/meson.build
|
./scripts/meson.build
|
||||||
./subprojects
|
./subprojects
|
||||||
]);
|
]);
|
||||||
|
@ -289,7 +288,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.importCargoLock { lockFile = ./lix-doc/Cargo.lock; };
|
cargoDeps = rustPlatform.importCargoLock { lockFile = ./src/lix-doc/Cargo.lock; };
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
lib.optionalString (!finalAttrs.dontBuild && !hostPlatform.isStatic) ''
|
lib.optionalString (!finalAttrs.dontBuild && !hostPlatform.isStatic) ''
|
||||||
|
|
0
lix-doc/.gitignore → src/lix-doc/.gitignore
vendored
0
lix-doc/.gitignore → src/lix-doc/.gitignore
vendored
0
lix-doc/Cargo.lock → src/lix-doc/Cargo.lock
generated
0
lix-doc/Cargo.lock → src/lix-doc/Cargo.lock
generated
8
src/lix-doc/package.nix
Normal file
8
src/lix-doc/package.nix
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
{ rustPlatform, lib }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage {
|
||||||
|
name = "lix-doc";
|
||||||
|
|
||||||
|
cargoLock.lockFile = ./Cargo.lock;
|
||||||
|
src = lib.cleanSource ./.;
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
# Subcomponents: these link into artifacts themselves, and have interdependencies.
|
# Subcomponents: these link into artifacts themselves, and have interdependencies.
|
||||||
|
subdir('lix-doc')
|
||||||
|
|
||||||
subdir('libutil')
|
subdir('libutil')
|
||||||
# Load-bearing order. libstore depends on libutil.
|
# Load-bearing order. libstore depends on libutil.
|
||||||
|
|
Loading…
Reference in a new issue