From 0102e6970720c2f24ad495ba0416b28975450804 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 21 Feb 2016 11:39:41 +0000 Subject: [PATCH] haskellPackages.c2hs: fix evaluation --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++----- 1 file 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; };