diff options
author | Peter Simons <simons@cryp.to> | 2015-02-25 19:42:02 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-03-09 15:55:25 +0100 |
commit | 0a97e2153e0546b47b39149f245f2a7c0e384f2c (patch) | |
tree | 062d227fa7ad21ecb96219e622e2909aa7eaae66 /pkgs/development/haskell-modules/generic-builder.nix | |
parent | aae9e49cbc0c8211532cb43c03cd73a97079a2bc (diff) | |
download | nixlib-0a97e2153e0546b47b39149f245f2a7c0e384f2c.tar nixlib-0a97e2153e0546b47b39149f245f2a7c0e384f2c.tar.gz nixlib-0a97e2153e0546b47b39149f245f2a7c0e384f2c.tar.bz2 nixlib-0a97e2153e0546b47b39149f245f2a7c0e384f2c.tar.lz nixlib-0a97e2153e0546b47b39149f245f2a7c0e384f2c.tar.xz nixlib-0a97e2153e0546b47b39149f245f2a7c0e384f2c.tar.zst nixlib-0a97e2153e0546b47b39149f245f2a7c0e384f2c.zip |
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.
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7d5a9dd59033..f1495422edbc 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 |