From d648be67246e771126defb34989ecb9f88292c64 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Apr 2015 20:34:26 +0200
Subject: [PATCH] buildRustPackage: Add check phase and enable it by default

Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
---
 pkgs/build-support/rust/default.nix                     | 9 ++++++++-
 pkgs/development/tools/build-managers/cargo/default.nix | 4 ++++
 pkgs/development/tools/rust/racer/default.nix           | 4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index a02163f73fa..45d706b8c56 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -39,10 +39,17 @@ in stdenv.mkDerivation (args // {
   '' + (args.prePatch or "");
 
   buildPhase = args.buildPhase or ''
-    echo "Running cargo build"
+    echo "Running cargo build --release"
     cargo build --release
   '';
 
+  checkPhase = args.checkPhase or ''
+    echo "Running cargo test"
+    cargo test
+  '';
+
+  doCheck = args.doCheck or true;
+
   installPhase = args.installPhase or ''
     mkdir -p $out/bin
     for f in $(find target/release -maxdepth 1 -type f); do
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index dadc3a093dc..894b77b96e3 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -25,6 +25,10 @@ buildRustPackage rec {
 
   buildPhase = "make";
 
+  # Disable check phase as there are lots of failures (some probably due to
+  # trying to access the network).
+  doCheck = false;
+
   installPhase = ''
     make install
     ${postInstall}
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index c22ee64b742..baa29f356ed 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -15,6 +15,10 @@ buildRustPackage rec {
 
   buildInputs = [ makeWrapper ];
 
+  preCheck = ''
+    export RUST_SRC_PATH="${rustc.src}/src"
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     cp -p target/release/racer $out/bin/