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

pkgs/build-support/cabal: updated recognition of Haskell packages for the directory new layout used in the stdenv-updates branch

Browse Source
This commit is contained in:
Peter Simons 2013-03-28 14:25:51 +01:00
parent fdbe2878f0
commit 270b858905
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/cabal/default.nix
View File

@ -110,14 +110,16 @@
done done
for p in $extraBuildInputs $propagatedNativeBuildInputs; do for p in $extraBuildInputs $propagatedNativeBuildInputs; do
if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then
# Haskell packages don't need any extra configuration.
continue;
fi
if [ -d "$p/include" ]; then if [ -d "$p/include" ]; then
extraConfigureFlags+=" --extra-include-dir=$p/include" extraConfigureFlags+=" --extra-include-dir=$p/include"
fi fi
for d in lib{,64}; do for d in lib{,64}; do
if [ -d "$p/$d" ]; then if [ -d "$p/$d" ]; then
if [ ! -d "$p/$d/ghc-pkgs" ]; then extraConfigureFlags+=" --extra-lib-dir=$p/$d"
extraConfigureFlags+=" --extra-lib-dir=$p/$d"
fi
fi fi
done done
done done