org-mode: Pass the full path to which'; use callPackage'.

svn path=/nixpkgs/trunk/; revision=23657

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"

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 { };