From 0a97e2153e0546b47b39149f245f2a7c0e384f2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 19:42:02 +0100 Subject: [PATCH] haskell-generic-builder.nix: don't add lib64 directories to the search path Packages that provide 32 and 64-bit libraries in the same store path are rare and usually require manual overrides anyway. It seems pointless to try and guess proper settings for them. The effect is that we'll end up with bogus settings that take more effort to correct that it takes to configure proper settings in the first place. Point in case: haskell-cuda and it's configuration for "cudatools". Fixes https://github.com/NixOS/nixpkgs/issues/6564. --- pkgs/development/haskell-modules/generic-builder.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7d5a9dd5903..f1495422edb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -147,11 +147,9 @@ stdenv.mkDerivation ({ if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi - for d in lib{,64}; do - if [ -d "$p/$d" ]; then - configureFlags+=" --extra-lib-dirs=$p/$d" - fi - done + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi done ghc-pkg --${packageDbFlag}="$packageConfDir" recache