diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-13 01:28:24 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-13 01:47:17 +0200 |
commit | 6b23cfe6894ab86ddf9b62944f39d616f993ff55 (patch) | |
tree | 012169a87630db47c7d85cfd73a0596c7f634028 /pkgs/development/tools/rust | |
parent | 736462d995435ad14540f8137fddbd467db63a0a (diff) | |
download | nixlib-6b23cfe6894ab86ddf9b62944f39d616f993ff55.tar nixlib-6b23cfe6894ab86ddf9b62944f39d616f993ff55.tar.gz nixlib-6b23cfe6894ab86ddf9b62944f39d616f993ff55.tar.bz2 nixlib-6b23cfe6894ab86ddf9b62944f39d616f993ff55.tar.lz nixlib-6b23cfe6894ab86ddf9b62944f39d616f993ff55.tar.xz nixlib-6b23cfe6894ab86ddf9b62944f39d616f993ff55.tar.zst nixlib-6b23cfe6894ab86ddf9b62944f39d616f993ff55.zip |
rustPlatform: add `buildAndTestSubdir`-argument
There are several tarballs (such as the `rust-lang/rust`-source) with a `Cargo.toml` at root and several sub-packages (with their own Cargo.toml) without using workspaces[1]. In such a case it's needed to move into a subdir to only build the specified sub-package (e.g. `rustfmt` or `rsl`), however the artifacts are at `/target` in the root-dir of the build environment. This breaks the build since `buildRustPackage` searches for executables in `target` (which is at the build-env's root) at the end of the `buildPhase`. With the optional `buildAndTestSubdir`-argument, the builder moves into the specified subdir using `pushd`/`popd` during `buildPhase` and `checkPhase`. Also moved the logic to find executables and libs to the end of the `buildPhase` from a custom `postBuild`-hook to fix packages with custom `build`/`install`-procedures such as `uutils-coreutils`. [1] https://doc.rust-lang.org/book/ch14-03-cargo-workspaces.html
Diffstat (limited to 'pkgs/development/tools/rust')
-rw-r--r-- | pkgs/development/tools/rust/rust-analyzer/generic.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index de755ec17ff5..ae6ad80cdd9a 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -15,9 +15,7 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - preBuild = "pushd crates/rust-analyzer"; - # Do not checking other crates in checkPhase. - preInstall = "popd"; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; |