From c21cbf22d0c56609a9be7c72e1b45ffe74c92010 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Tue, 26 May 2020 11:52:18 -0700 Subject: buildRustCrate: Replace hyphen with underscore in env variables (#88054) * Add test case for include dir * buildRustCrate: replace hyphen with underscore in env This fixes a bug that prevents encoding_c from building. --- pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support/rust/build-rust-crate/configure-crate.nix') 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 -- cgit 1.4.1