From 3995655d2c2cc7d9804172cd393cf673a21c5832 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 17 Nov 2016 07:25:42 -0500 Subject: [PATCH] Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld" This fix doesn't actually fix the cabal bug (see #16357), but it does cause other bugs (see #20476) Fixes #20476 This reverts commit b89fa5fd5cc3e7d27fb87bc792fe0d6553aec28d, reversing changes made to e4b146b0417762c461c7f90f587dc82e8524f796. --- pkgs/development/haskell-modules/generic-builder.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b597532b44..f9da4757696 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -194,9 +194,6 @@ stdenv.mkDerivation ({ fi if [ -d "$p/lib" ]; then configureFlags+=" --extra-lib-dirs=$p/lib" - ${ stdenv.lib.optionalString stdenv.isDarwin - "export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib" - } fi done ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache