about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-05-07 11:56:23 +0200
committerPeter Simons <simons@cryp.to>2014-05-07 19:13:06 +0200
commitfc51c1d16341f1d5a2a55832fe0ca7b3152864ce (patch)
treebf7b24db5c713cc953e74ad9e967c5d8a8d8e3f4 /pkgs/build-support
parentbd36eadf98bf16ff08bcdfeb2c6f78a1eeab10ab (diff)
downloadnixlib-fc51c1d16341f1d5a2a55832fe0ca7b3152864ce.tar
nixlib-fc51c1d16341f1d5a2a55832fe0ca7b3152864ce.tar.gz
nixlib-fc51c1d16341f1d5a2a55832fe0ca7b3152864ce.tar.bz2
nixlib-fc51c1d16341f1d5a2a55832fe0ca7b3152864ce.tar.lz
nixlib-fc51c1d16341f1d5a2a55832fe0ca7b3152864ce.tar.xz
nixlib-fc51c1d16341f1d5a2a55832fe0ca7b3152864ce.tar.zst
nixlib-fc51c1d16341f1d5a2a55832fe0ca7b3152864ce.zip
cabal: enable the split-objects feature again for current versions of GHC
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/cabal/default.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 45bd5567fc4c..047bccebf095 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -133,9 +133,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             jailbreak = false;
 
             # pass the '--enable-split-objs' flag to cabal in the configure stage
-            enableSplitObjs = !(  stdenv.isDarwin                       # http://hackage.haskell.org/trac/ghc/ticket/4013
-                               || versionOlder "7.6.99" ghc.version     # -fsplit-ojbs is broken in 7.7 snapshot
-                               );
+            enableSplitObjs = !stdenv.isDarwin;         # http://hackage.haskell.org/trac/ghc/ticket/4013
 
             # pass the '--enable-tests' flag to cabal in the configure stage
             # and run any regression test suites the package might have