mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge pull request #56661 from matthewbauer/stack-hook-fixup
stack-hook: deduplicate better
This commit is contained in:
commit
ca6e93155b
@ -1,11 +1,11 @@
|
||||
addStackArgs () {
|
||||
if [ -d "$1/lib" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-lib-dirs=$1/lib"* ]]; then
|
||||
if [ -n "$(echo $1/lib/lib*)" ]; then
|
||||
STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib"
|
||||
fi
|
||||
|
||||
if [ -d "$1/include" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-include-dirs=$1/include"* ]]; then
|
||||
if [ -d "$1/include" ]; then
|
||||
STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$1/include"
|
||||
fi
|
||||
}
|
||||
|
||||
addEnvHooks "$hostOffset" addStackArgs
|
||||
addEnvHooks "$targetOffset" addStackArgs
|
||||
|
Loading…
Reference in New Issue
Block a user