summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2025-07-07 21:50:37 +0200
committerGitHub <noreply@github.com>2025-07-07 21:50:37 +0200
commitd00567a842a697dcf250a37fdbb94966112c5b54 (patch)
tree2f21fd516df6bbb6d95ce3c0701ee49729e5380a
parentlux-cli: use finalAttrs pattern (#423258) (diff)
downloadnixpkgs-origin/revert-401965-buildRustCrate-env.tar.gz
Revert "buildRustCrate: add missing env variables for build scripts"origin/revert-401965-buildRustCrate-env
-rw-r--r--pkgs/build-support/rust/build-rust-crate/configure-crate.nix3
1 files changed, 1 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 007b9553509b..30f13b988c6a 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -246,10 +246,9 @@ in
IFS="$_OLDIFS"
CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g")
- CRATEVERSION=$(echo ${crateVersion} | sed -e "s/[\.\+]/_/g")
grep -P "^cargo:(?!:?(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
| awk -F= "/^cargo::metadata=/ { gsub(/-/, \"_\", \$2); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$2) \"=\" \"\\\"\"\$3\"\\\"\"; next }
- /^cargo:/ { sub(/^cargo::?/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; print \"export \" toupper(\"DEP_$(echo $CRATENAME)_$(echo $CRATEVERSION)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; next }" > target/env
+ /^cargo:/ { sub(/^cargo::?/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; next }" > target/env
set -e
fi
runHook postConfigure