about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-02-21 11:39:41 +0000
committerRobin Gloster <mail@glob.in>2016-02-21 11:39:41 +0000
commit0102e6970720c2f24ad495ba0416b28975450804 (patch)
treef32a3412a93e471213f73e3dbac1b205ffd265e8 /pkgs/development
parent27e8d31b1afba4aa9deca84948def09971c3574c (diff)
downloadnixlib-0102e6970720c2f24ad495ba0416b28975450804.tar
nixlib-0102e6970720c2f24ad495ba0416b28975450804.tar.gz
nixlib-0102e6970720c2f24ad495ba0416b28975450804.tar.bz2
nixlib-0102e6970720c2f24ad495ba0416b28975450804.tar.lz
nixlib-0102e6970720c2f24ad495ba0416b28975450804.tar.xz
nixlib-0102e6970720c2f24ad495ba0416b28975450804.tar.zst
nixlib-0102e6970720c2f24ad495ba0416b28975450804.zip
haskellPackages.c2hs: fix evaluation
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f163874f2361..f6eae83a20c5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -44,11 +44,9 @@ self: super: {
   options_1_2 = dontCheck super.options_1_2;
   options = dontCheck super.options;
   statistics = dontCheck super.statistics;
-  c2hs = let c2hs_ = pkgs.stdenv.lib.overrideDerivation super.c2hs (drv: {
-        hardening_format = false;
-        doCheck = false;
-      });
-    in if pkgs.stdenv.isDarwin then dontCheck c2hs_ else c2hs_;
+  c2hs = pkgs.lib.overrideDerivation (dontCheck super.c2hs) (drv: {
+    hardening_format = false;
+  });
 
   # The package doesn't compile with ruby 1.9, which is our default at the moment.
   hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };