From b31ac058cc19f1ebc2a15b4f6ff4475eb91b0206 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Oct 2014 12:56:48 +0200
Subject: [PATCH] magit: don't install lisp files into a "magit" sub-directory

After this change, Emacs can load the magit-*.el files without further
configuration. Just add

    (require 'magit-autoloads)

to ~/.emacs, and run M-x magit-status or any other magit command.
---
 pkgs/applications/editors/emacs-modes/magit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 093a5420a5ee..4a8d8b20d04a 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray=(
       PREFIX="$out"
       EFLAGS="-L ${gitModes}/share/emacs/site-lisp"
+      lispdir="$out/share/emacs/site-lisp"
     )
   '';