Merge pull request #22613 from shajra/fix/9871-3

Haskell infrastructure: fix #9871 (overrideCabal)
2017-02-27 12:54:27 +01:00
parent 9a052a33b6 98617ccb99
commit e649974271
2 changed files with 5 additions and 6 deletions
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -3,7 +3,7 @@
 rec {

  overrideCabal = drv: f: (drv.override (args: args // {
-    mkDerivation = drv: args.mkDerivation (drv // f drv);
+    mkDerivation = drv: (args.mkDerivation drv).override f;
  })) // {
    overrideScope = scope: overrideCabal (drv.overrideScope scope) f;
  };