From 883610729144f72b548141761e9e92b094c209db Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 11 Jan 2020 12:00:00 +0000 Subject: rust: include the rustc-dev component This enables to compile rls and rustc See also https://github.com/rust-lang/rust/pull/64823 (cherry picked from commit 47681d7c5c9529615e9f481f02d945a2c3cfe599) --- nixpkgs/pkgs/development/compilers/rust/rustc.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'nixpkgs') diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index e5c8a709a900..2c235a12b312 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -132,9 +132,14 @@ in stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; setOutputFlags = false; - # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so - # and thus a transitive dependency on ncurses postInstall = '' + # install rustc-dev components. Necessary to build rls, clippy... + python x.py dist rustc-dev + tar xf build/dist/rustc-dev*tar.gz + cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/ + + # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so + # and thus a transitive dependency on ncurses find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+' ''; -- cgit 1.4.1