diff options
| author | Aaron Janse <aaron@ajanse.me> | 2020-10-14 22:54:04 -0700 |
|---|---|---|
| committer | Aaron Janse <aaron@ajanse.me> | 2020-10-14 22:54:04 -0700 |
| commit | a153be896f275e5f394c55bdbbd267356d49f7b2 (patch) | |
| tree | e6e38f4482b7dc153ca2a52595e374c735849e07 /pkgs/build-support/rust | |
| parent | 015d4e2e98368b44cdf3a6d424ef35f0fed5072e (diff) | |
| download | nixpkgs-a153be896f275e5f394c55bdbbd267356d49f7b2.tar nixpkgs-a153be896f275e5f394c55bdbbd267356d49f7b2.tar.gz nixpkgs-a153be896f275e5f394c55bdbbd267356d49f7b2.tar.bz2 nixpkgs-a153be896f275e5f394c55bdbbd267356d49f7b2.tar.lz nixpkgs-a153be896f275e5f394c55bdbbd267356d49f7b2.tar.xz nixpkgs-a153be896f275e5f394c55bdbbd267356d49f7b2.tar.zst nixpkgs-a153be896f275e5f394c55bdbbd267356d49f7b2.zip | |
use rustcSrc
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/sysroot/default.nix | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix index 2625306b246..de82f2bf30a 100644 --- a/pkgs/build-support/rust/sysroot/default.nix +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -2,24 +2,18 @@ { shortTarget, originalCargoToml, target, RUSTFLAGS }: -let rustSrc = stdenv.mkDerivation { - name = "rust-src"; - src = rustPlatform.rust.rustc.src; - preferLocalBuild = true; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = "cp -r src $out"; - }; +let cargoSrc = stdenv.mkDerivation { - name = "cargo-src"; - preferLocalBuild = true; - phases = [ "installPhase" ]; - installPhase = '' - RUSTC_SRC=${rustSrc} ORIG_CARGO=${originalCargoToml} \ - ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} - mkdir -p $out - cp Cargo.toml $out/Cargo.toml - cp ${./Cargo.lock} $out/Cargo.lock - ''; + name = "cargo-src"; + preferLocalBuild = true; + phases = [ "installPhase" ]; + installPhase = '' + RUSTC_SRC=${rustPlatform.rustcSrc} ORIG_CARGO=${originalCargoToml} \ + ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} + mkdir -p $out + cp Cargo.toml $out/Cargo.toml + cp ${./Cargo.lock} $out/Cargo.lock + ''; }; in rustPlatform.buildRustPackage { inherit target RUSTFLAGS; |