From c4323c200f5c1b08b3bf5147f95a70a58c464cfb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 21 Jul 2019 01:16:33 +0200 Subject: [PATCH] evcxr: fix hash and `cc` access The `cargoSha256` hashes across the sourcetree had to be altered after the last `cargo-vendor` bump. Also ensured that `cc` is available in `$PATH` to avoid startup errors in the REPL. --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 3a517cb03be..c5099a67a1d 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,4 +1,4 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv }: +{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc }: rustPlatform.buildRustPackage rec { name = "evcxr-${version}"; @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { sha256 = "1apc93z9vvf6qks5x2pad45rnrj9kjl812rj78w5zmmizccp2fhf"; }; - cargoSha256 = "0bd6yna8yyrqjv4w7qr2923nljbjjlbkyad6vjlgfp33yn2pz1iv"; + cargoSha256 = "153pxqj4jhlbacr7607q9yfw6h96ns5igbvssis8j3gn0xp6ssg6"; cargoPatches = [ ./cargo-lock.patch ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ cargo ]; postInstall = '' - wrapProgram $out/bin/evcxr --prefix PATH : ${cargo}/bin + wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} rm $out/bin/testing_runtime '';