BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

buildRustCrate: use tr instead of sed (it reads a bit nicer)

Browse source 
I already have a few changes in here that will trigger rebuilds so I
might as well do that substitution now.
This commit is contained in:
Andreas Rammhold 2019-12-11 22:40:19 +01:00
parent 50b2ef28f7
commit db55d1f89d
No known key found for this signature in database
GPG key ID: E432E410B5E48C86
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/rust/build-rust-crate/build-crate.nix
View file

@ -36,7 +36,7 @@
build_bin() {
crate_name=$1
crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
crate_name_=$(echo $crate_name | tr '-' '_')
main_file=""
if [[ ! -z $2 ]]; then
main_file=$2
@ -54,7 +54,7 @@
EXTRA_LIB=""
CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g")
CRATE_NAME=$(echo ${libName} | tr '-' '_')
if [[ -e target/link_ ]]; then
EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD"
@ -108,7 +108,7 @@
# https://github.com/rust-lang/cargo/blob/90fc9f620190d5fa3c80b0c8c65a1e1361e6b8ae/src/cargo/util/toml/targets.rs#L308-L325
# the first two cases are the "new" default IIRC
BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
BIN_NAME_=$(echo $BIN_NAME | tr '-' '_')
FILES=( "src/bin/$BIN_NAME.rs" "src/bin/$BIN_NAME/main.rs" "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