From 80518eab94cedbfc3a8bd4c0e4062d0664813cc0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Jan 2015 10:30:00 +0100
Subject: [PATCH] haskell-configuration-ghc-7.8.x: clean up amazonkaEnv

---
 .../configuration-ghc-7.8.x.nix               | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 1c8a024b9a7..a3a0072f1c6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -69,11 +69,12 @@ self: super: {
 // # packages relating to amazonka
 
 (let
-  amazonkaEnv = let self_ = self; in self: super: {
+  Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
+  amazonkaEnv = self: super: {
     mkDerivation = drv: super.mkDerivation (drv // {
       doCheck = false;
       hyperlinkSource = false;
-      extraLibraries = (drv.extraLibraries or []) ++ [ (
+      buildTools = (drv.buildTools or []) ++ [ (
         if pkgs.stdenv.lib.elem drv.pname [
           "Cabal"
           "time"
@@ -81,7 +82,7 @@ self: super: {
           "directory"
           "process"
           "jailbreak-cabal"
-        ] then null else self.Cabal_1_18_1_6
+        ] then null else Cabal
       ) ];
     });
     mtl = self.mtl_2_2_1;
@@ -94,18 +95,11 @@ self: super: {
     process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; });
     inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
   };
-  Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
-  amazonka-core =
-    overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: {
-      # https://github.com/brendanhay/amazonka/pull/57
-      prePatch = "sed -i 's|nats >= 0.1.3 && < 1|nats|' amazonka-core.cabal";
-      extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ];
-    });
-  useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: {
-    buildDepends = (drv.buildDepends or []) ++ [ Cabal ];
-  });
-  amazonka = useEnvCabal super.amazonka;
-  amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch;
+  amazonka = super.amazonka.overrideScope amazonkaEnv;
+  amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv;
+  amazonka-core = super.amazonka-core.overrideScope amazonkaEnv;
+  amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv;
 in {
-  inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
+  inherit amazonkaEnv;
+  inherit amazonka amazonka-cloudwatch amazonka-core amazonka-kms;
 })