nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56661 from matthewbauer/stack-hook-fixup

Browse Source 
stack-hook: deduplicate better
This commit is contained in:
Matthew Bauer 2019-03-09 18:08:47 -05:00 committed by GitHub
commit ca6e93155b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/stack-hook.sh
View File

@ -1,11 +1,11 @@
addStackArgs () { 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" STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib"
fi 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" STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$1/include"
fi fi
} }
addEnvHooks "$hostOffset" addStackArgs addEnvHooks "$targetOffset" addStackArgs