From 777c9c3768a10f1e62f90c797ce63717e4a74092 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 29 Oct 2015 15:07:18 +0100 Subject: [PATCH] buildRustPackage: fix erroneous /bin/sh reference The fetch-cargo-deps script is written in bash syntax, but it erroneously ran under the /bin/sh interpreter. This wasn't noticed because /bin/sh is actually bash in NixOS, but on some other systems this is not true. --- pkgs/build-support/rust/fetch-cargo-deps | 2 -- pkgs/build-support/rust/fetchcargo.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index ae1ca62050f..04d33c60d30 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -1,5 +1,3 @@ -#! /bin/sh - source $stdenv/setup set -euo pipefail diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 5dd80bd4aa5..0ce1d0a11d3 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; installPhase = '' - ${./fetch-cargo-deps} . "$out" + bash ${./fetch-cargo-deps} . "$out" ''; outputHashAlgo = "sha256";