From d30e9082bb7a57baefa7f8f192b7b50f67e5066f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 12 Jan 2015 12:20:42 -0500 Subject: [PATCH] D'oh --- pkgs/development/haskell-modules/lib.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 99ae61ee975..68750fbb135 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -2,10 +2,11 @@ rec { - overrideCabal = drv: f: drv.override (args: args // { + overrideCabal = drv: f: (drv.override (args: args // { mkDerivation = drv: args.mkDerivation (drv // f drv); + })) // { overrideScope = scope: overrideCabal (drv.overrideScope scope) f; - }); + }; doHaddock = drv: overrideCabal drv (drv: { noHaddock = false; }); dontHaddock = drv: overrideCabal drv (drv: { noHaddock = true; });