ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

Barf on non-existant build inputs

Browse Source 
Previously saying

  buildInputs = [ "bla" ];

was quietly ignored. Now it's a fatal error.
This commit is contained in:
Eelco Dolstra 2015-06-15 11:24:55 +02:00
parent 41e1900ea1
commit 42d94b6f15
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/stdenv/generic/setup.sh
View File

@ -222,7 +222,7 @@ runHook addInputsHook
# Recursively find all build inputs.
findInputs() {
local pkg=$1
local pkg="$1"
local var=$2
local propagatedBuildInputsFile=$3
@ -234,17 +234,22 @@ findInputs() {
eval $var="'${!var} $pkg '"
if [ -f $pkg ]; then
source $pkg
if ! [ -e "$pkg" ]; then
echo "build input $pkg does not exist" >&2
exit 1
fi
if [ -f $pkg/nix-support/setup-hook ]; then
source $pkg/nix-support/setup-hook
if [ -f "$pkg" ]; then
source "$pkg"
fi
if [ -f $pkg/nix-support/$propagatedBuildInputsFile ]; then
for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do
findInputs $i $var $propagatedBuildInputsFile
if [ -f "$pkg/nix-support/setup-hook" ]; then
source "$pkg/nix-support/setup-hook"
fi
if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
for i in $(cat "$pkg/nix-support/$propagatedBuildInputsFile"); do
findInputs "$i" $var $propagatedBuildInputsFile
done
fi
}