ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37928 from VShell/patch-2

Browse Source 
buildRustCrate: fix equality testing
This commit is contained in:
Jörg Thalheim 2018-03-28 09:34:41 +01:00 committed by GitHub
commit 8a8a73701d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/rust/build-rust-crate.nix
View File

@ -19,7 +19,7 @@ let makeDeps = dependencies:
echo_build_heading() { echo_build_heading() {
start="" start=""
end="" end=""
if [[ x"${colors}" -eq x"always" ]]; then if [[ "${colors}" == "always" ]]; then
start="$(printf '\033[0;1;32m')" #set bold, and set green. start="$(printf '\033[0;1;32m')" #set bold, and set green.
end="$(printf '\033[0m')" #returns to "normal" end="$(printf '\033[0m')" #returns to "normal"
fi fi
@ -34,7 +34,7 @@ let makeDeps = dependencies:
noisily() { noisily() {
start="" start=""
end="" end=""
if [[ x"${colors}" -eq x"always" ]]; then if [[ "${colors}" == "always" ]]; then
start="$(printf '\033[0;1;32m')" #set bold, and set green. start="$(printf '\033[0;1;32m')" #set bold, and set green.
end="$(printf '\033[0m')" #returns to "normal" end="$(printf '\033[0m')" #returns to "normal"
fi fi
@ -194,7 +194,7 @@ let makeDeps = dependencies:
bold="" bold=""
green="" green=""
boldgreen="" boldgreen=""
if [[ "${colors}" -eq "always" ]]; then if [[ "${colors}" == "always" ]]; then
norm="$(printf '\033[0m')" #returns to "normal" norm="$(printf '\033[0m')" #returns to "normal"
bold="$(printf '\033[0;1m')" #set bold bold="$(printf '\033[0;1m')" #set bold
green="$(printf '\033[0;32m')" #set green green="$(printf '\033[0;32m')" #set green
@ -230,7 +230,7 @@ let makeDeps = dependencies:
${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
$LINK ${deps}$EXTRA_LIB --cap-lints allow \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \
$BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
if [ "$crate_name_" -ne "$crate_name" ]; then if [ "$crate_name_" != "$crate_name" ]; then
mv target/bin/$crate_name_ target/bin/$crate_name mv target/bin/$crate_name_ target/bin/$crate_name
fi fi
} }