From 78adb9fbf15e0d7c48b8f625e46dfa0125936c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 6 Sep 2010 07:58:13 +0000
Subject: [PATCH] org-mode: Pass the full path to `which'; use `callPackage'.

svn path=/nixpkgs/trunk/; revision=23657
---
 pkgs/applications/editors/emacs-modes/org/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix                       | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 31efaf8de23..559bc957f07 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, texinfo }:
+{ fetchurl, stdenv, emacs, texinfo, which }:
 
 stdenv.mkDerivation rec {
   name = "org-7.01f";
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ emacs texinfo ];
 
+  patchPhase =
+    '' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
+    '';
+
   configurePhase =
     '' sed -i Makefile \
            -e "s|^prefix=.*$|prefix=$out|g"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 110f039b58e..b66156a449f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5430,9 +5430,7 @@ let
 
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
     # we want it to have higher precedence.
-    org = hiPrio (import ../applications/editors/emacs-modes/org {
-      inherit fetchurl stdenv emacs texinfo;
-    });
+    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
 
     prologMode = callPackage ../applications/editors/emacs-modes/prolog { };