From 4c1afe5ccee7fa2eaf0731d7dbd51aeaaae2e5d1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Apr 2015 15:52:46 +0300
Subject: [PATCH] leksah: move to haskell tools and add cabal to path

---
 pkgs/development/tools/{ => haskell}/leksah/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/tools/{ => haskell}/leksah/default.nix (94%)

diff --git a/pkgs/development/tools/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
similarity index 94%
rename from pkgs/development/tools/leksah/default.nix
rename to pkgs/development/tools/haskell/leksah/default.nix
index 24570a9b68e..fb91015e10c 100644
--- a/pkgs/development/tools/leksah/default.nix
+++ b/pkgs/development/tools/haskell/leksah/default.nix
@@ -1,7 +1,7 @@
 { stdenv, ghcWithPackages, gtk3, makeWrapper }:
 
 let
-leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah ]);
+leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
 in stdenv.mkDerivation {
   name = "leksah";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73a175a0a57..aa35e813d70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7417,7 +7417,7 @@ let
 
   lambdabot = callPackage ../development/tools/haskell/lambdabot { };
 
-  leksah = callPackage ../development/tools/leksah {
+  leksah = callPackage ../development/tools/haskell/leksah {
     inherit (haskellngPackages) ghcWithPackages;
   };