about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
authorSymphorien Gibol <symphorien+git@xlumurb.eu>2020-01-11 12:00:00 +0000
committerAlyssa Ross <hi@alyssa.is>2020-01-27 04:00:38 +0000
commit883610729144f72b548141761e9e92b094c209db (patch)
tree3b9c6f6c1564cbe7e7ff3b422f4d3e3d07f46a55 /nixpkgs
parent0700c42ff2d689f335594d342b339c9b64413380 (diff)
downloadnixlib-883610729144f72b548141761e9e92b094c209db.tar
nixlib-883610729144f72b548141761e9e92b094c209db.tar.gz
nixlib-883610729144f72b548141761e9e92b094c209db.tar.bz2
nixlib-883610729144f72b548141761e9e92b094c209db.tar.lz
nixlib-883610729144f72b548141761e9e92b094c209db.tar.xz
nixlib-883610729144f72b548141761e9e92b094c209db.tar.zst
nixlib-883610729144f72b548141761e9e92b094c209db.zip
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)
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/pkgs/development/compilers/rust/rustc.nix9
1 files changed, 7 insertions, 2 deletions
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} '{}' '+'
   '';