JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rust build-support: fixing a compilation error in some crates (such as proc-macro2)

Browse Source
This commit is contained in:
Pierre-Étienne Meunier 2018-11-16 12:12:59 +00:00
parent 5632aad473
commit f1de24feb8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
View File

@ -71,6 +71,8 @@ in ''
export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0} export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}
export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1} export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}
export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2} export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
export NUM_JOBS=1
export RUSTC="rustc"
if [[ -n "${versionPre}" ]]; then if [[ -n "${versionPre}" ]]; then
export CARGO_PKG_VERSION_PRE="${versionPre}" export CARGO_PKG_VERSION_PRE="${versionPre}"
fi fi

2
pkgs/build-support/rust/build-rust-crate/install-crate.nix
View File

@ -20,9 +20,11 @@ crateName: metadata:
mkdir -p $out/lib mkdir -p $out/lib
cp -r target/build/* $out/lib # */ cp -r target/build/* $out/lib # */
fi fi
if [[ -d target/bin ]]; then
if [[ "$(ls -A target/bin)" ]]; then if [[ "$(ls -A target/bin)" ]]; then
mkdir -p $out/bin mkdir -p $out/bin
cp -P target/bin/* $out/bin # */ cp -P target/bin/* $out/bin # */
fi fi
fi
runHook postInstall runHook postInstall
'' ''