Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3245241d8c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05d4cdfad174
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 11, 2020

  1. rust: include the rustc-dev component 

    This enables to compile rls and rustc

See also rust-lang/rust#64823
    @symphorien
    symphorien committed Jan 11, 2020
    Copy the full SHA
    47681d7 View commit details

Commits on Jan 12, 2020

  1. Merge pull request #77529 from symphorien/rls 

    rust: include the rustc-dev component
    @LnL7
    LnL7 authored Jan 12, 2020
    Copy the full SHA
    05d4cdf View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/development/compilers/rust/rustc.nix
9 changes: 7 additions & 2 deletions pkgs/development/compilers/rust/rustc.nix
View file
Original file line number Diff line number Diff line change
@@ -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} '{}' '+'
'';