diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:28 +0200 |
| commit | 362d88c2b19e3857576b2571722dc66c381c185a (patch) | |
| tree | 7dc706e1918e7dc1e9762573831c851be4343559 /pkgs/build-support/rust/build-rust-crate/configure-crate.nix | |
| parent | 0367fa630d59673624d6742e2758b87eb12fff4c (diff) | |
| parent | 1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e (diff) | |
| download | nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.gz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.bz2 nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.lz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.xz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.zst nixlib-362d88c2b19e3857576b2571722dc66c381c185a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support/rust/build-rust-crate/configure-crate.nix')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index ed8100537090..c47bc00938c1 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -179,9 +179,9 @@ in '' export $env done - CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") + CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g") grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ - | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env + | awk -F= "/^cargo:/ { sub(/^cargo:/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \$2 }" > target/env set -e fi runHook postConfigure |