diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-03-14 00:38:30 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-03-14 16:55:06 +0000 |
commit | 6cea0daaa94856d12d2e62650f82f78db4770b19 (patch) | |
tree | cff3aa8d28d37fc2c2637c5bac91f29cce0b143a | |
parent | 337b35707de719748307face5a382e4e7611f401 (diff) | |
download | nixlib-6cea0daaa94856d12d2e62650f82f78db4770b19.tar nixlib-6cea0daaa94856d12d2e62650f82f78db4770b19.tar.gz nixlib-6cea0daaa94856d12d2e62650f82f78db4770b19.tar.bz2 nixlib-6cea0daaa94856d12d2e62650f82f78db4770b19.tar.lz nixlib-6cea0daaa94856d12d2e62650f82f78db4770b19.tar.xz nixlib-6cea0daaa94856d12d2e62650f82f78db4770b19.tar.zst nixlib-6cea0daaa94856d12d2e62650f82f78db4770b19.zip |
rustracerd: build with current rust
Fix taken from https://github.com/jwilm/racerd/pull/82. It just updates a dependency.
-rw-r--r-- | pkgs/development/tools/rust/racerd/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index c49ea2aaf128..02b32c6485e6 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }: +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }: rustPlatform.buildRustPackage rec { pname = "racerd"; @@ -11,7 +11,14 @@ rustPlatform.buildRustPackage rec { sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln"; }; - cargoSha256 = "1nwjr7v8hkhsql93wbwk5gqqiq725gj5iwwsbd250my9g5kkfdbw"; + cargoPatches = [ + (fetchpatch { + url = "https://github.com/jwilm/racerd/commit/856f3656e160cd2909c5166e962f422c901720ee.patch"; + sha256 = "1qq2k4bnwjz5qgn7s8yxd090smwn2wvdm8dd1rrlgpln0a5vxkpb"; + }) + ]; + + cargoSha256 = "1z0dh2j9ik66i6nww3z7z2gw7nhc0b061zxbjzamk1jybpc845lq"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c30bc270ad47..309cfde1fff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8925,7 +8925,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; rustracerd = callPackage ../development/tools/rust/racerd { - inherit (rustPackages_1_38_0) rustPlatform; inherit (darwin.apple_sdk.frameworks) Security; }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; |