public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildRustCrate: binary heuristic should be able to treat spaces

Browse Source
This commit is contained in:
Andreas Rammhold 2018-09-08 23:02:06 +02:00
parent 1371815060
commit fdc2017f1c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/rust/build-rust-crate/build-crate.nix
View File

@ -117,15 +117,14 @@
# the first two cases are the "new" default IIRC # the first two cases are the "new" default IIRC
BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g') BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
FILES="src/bin/$BIN_NAME_.rs src/bin/$BIN_NAME_/main.rs src/bin/main.rs src/main.rs" FILES=( "src/bin/$BIN_NAME_.rs" "src/bin/$BIN_NAME_/main.rs" "src/bin/main.rs" "src/main.rs" )
if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then
# if this is not a library the following path is also valid # if this is not a library the following path is also valid
FILES="src/$BIN_NAME_.rs $FILES" FILES=( "src/$BIN_NAME_.rs" "''${FILES[@]}" )
fi fi
echo $FILES for file in "''${FILES[@]}";
for file in $FILES;
do do
echo "checking file $file" echo "checking file $file"
# first file that exists wins # first file that exists wins
@ -140,7 +139,7 @@
exit 1 exit 1
fi fi
fi fi
build_bin $BIN_NAME $BIN_PATH build_bin "$BIN_NAME" "$BIN_PATH"
done done