diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
| commit | fc7bd322dfcd204ce6daa95285ff358999ff9a8d (patch) | |
| tree | 152ad62f3f30148a64a247fc583af45c80cab40c /pkgs/development/compilers/rust/rls/default.nix | |
| parent | 2d91ad963fe799fce74cf52d8d9ea2d4bc963a93 (diff) | |
| parent | 1d26caa746f7eda613c5e87342889e55b9e5ba96 (diff) | |
| download | nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.gz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.bz2 nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.lz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.xz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.zst nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/compilers/rust/rls/default.nix')
| -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 7534a52fe0f..c57b28aee51 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv , CoreFoundation, Security }: rustPlatform.buildRustPackage { @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); |