diff options
| author | Daniël de Kok <me@danieldk.eu> | 2021-02-15 12:01:34 +0100 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2021-02-17 16:47:15 +0100 |
| commit | 2376921de5c85b75e9b868d1f9dd98d209a19afc (patch) | |
| tree | 8b671d7c61686286fe61a8e9ddccf95481e580f0 /pkgs/development/compilers/rust | |
| parent | 2df314c261c06c51a940338e2b3f7997d58208ef (diff) | |
| download | nixpkgs-2376921de5c85b75e9b868d1f9dd98d209a19afc.tar nixpkgs-2376921de5c85b75e9b868d1f9dd98d209a19afc.tar.gz nixpkgs-2376921de5c85b75e9b868d1f9dd98d209a19afc.tar.bz2 nixpkgs-2376921de5c85b75e9b868d1f9dd98d209a19afc.tar.lz nixpkgs-2376921de5c85b75e9b868d1f9dd98d209a19afc.tar.xz nixpkgs-2376921de5c85b75e9b868d1f9dd98d209a19afc.tar.zst nixpkgs-2376921de5c85b75e9b868d1f9dd98d209a19afc.zip | |
rls: update preBuild for changes in buildRustPackage
preBuild is now run before changing to buildAndTestSubdir, so use full path to tests/client.rs in preBuild.
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/rls/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index ee860d78258..f2835919631 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -2,7 +2,7 @@ , openssh, openssl, pkg-config, cmake, zlib, curl, libiconv , CoreFoundation, Security }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "rls"; inherit (rustPlatform.rust.rustc) src version; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { preBuild = '' # client tests are flaky - rm tests/client.rs + rm ${buildAndTestSubdir}/tests/client.rs ''; # a nightly compiler is required unless we use this cheat code. |