diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 18b7dbfc03be..f163874f2361 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -44,7 +44,11 @@ self: super: { options_1_2 = dontCheck super.options_1_2; options = dontCheck super.options; statistics = dontCheck super.statistics; - c2hs = if pkgs.stdenv.isDarwin then dontCheck super.c2hs else super.c2hs; + 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_; # 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; }; @@ -242,7 +246,9 @@ self: super: { gio_0_13_0_3 = addPkgconfigDepend super.gio_0_13_0_3 pkgs.glib; gio_0_13_0_4 = addPkgconfigDepend super.gio_0_13_0_4 pkgs.glib; gio_0_13_1_0 = addPkgconfigDepend super.gio_0_13_1_0 pkgs.glib; - glib = addPkgconfigDepend super.glib pkgs.glib; + glib = addPkgconfigDepend (overrideCabal super.glib (drv: { + hardening_fortify = false; + })) pkgs.glib; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; gtk = addPkgconfigDepend super.gtk pkgs.gtk; gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; |