From eb99d3a670957765e4ade5c2b3086c813b07e1ca Mon Sep 17 00:00:00 2001
From: Nicholas Clarke <nick@topos.org.uk>
Date: Thu, 24 Aug 2017 17:21:08 +0100
Subject: [PATCH] Fix git-annex.

---
 pkgs/development/haskell-modules/configuration-nix.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c97a586d1eae..c1813cad7a9e 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -499,7 +499,6 @@ self: super: builtins.intersectAttrs super {
   # Disable separate bin outputs for these specific packages that break with it.
   H = hasNoBinOutput super.H;
   cryptol = hasNoBinOutput super.cryptol;
-  git-annex = hasNoBinOutput super.git-annex;
   sproxy = hasNoBinOutput super.sproxy;
   sproxy2 = hasNoBinOutput super.sproxy2;
   sproxy-web = hasNoBinOutput super.sproxy-web;
@@ -508,6 +507,11 @@ self: super: builtins.intersectAttrs super {
   sugarhaskell = hasNoBinOutput super.sugarhaskell;
   zerobin = hasNoBinOutput super.zerobin;
 
+  git-annex = overrideCabal super.git-annex (drv: {
+    enableSeparateBinOutput = false;
+    enableSeparateEtcOutput = false;
+  });
+
   # Override a number of packages with specific references to $out in their
   # derivations
   stack = overrideCabal super.stack (drv: {