diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2019-12-11 22:40:19 +0100 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2019-12-11 22:40:19 +0100 |
| commit | db55d1f89d3ee2aa0019aceb40c233d509eb2811 (patch) | |
| tree | 682149af72dc500c97a822942b6e06e2574dde4d /pkgs/build-support/rust | |
| parent | 50b2ef28f72a824efc0dde96094133fc07a36433 (diff) | |
| download | nixpkgs-db55d1f89d3ee2aa0019aceb40c233d509eb2811.tar nixpkgs-db55d1f89d3ee2aa0019aceb40c233d509eb2811.tar.gz nixpkgs-db55d1f89d3ee2aa0019aceb40c233d509eb2811.tar.bz2 nixpkgs-db55d1f89d3ee2aa0019aceb40c233d509eb2811.tar.lz nixpkgs-db55d1f89d3ee2aa0019aceb40c233d509eb2811.tar.xz nixpkgs-db55d1f89d3ee2aa0019aceb40c233d509eb2811.tar.zst nixpkgs-db55d1f89d3ee2aa0019aceb40c233d509eb2811.zip | |
buildRustCrate: use tr instead of sed (it reads a bit nicer)
I already have a few changes in here that will trigger rebuilds so I might as well do that substitution now.
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/build-crate.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index c3880a1fc87..be678ce927b 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -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 |