Author: ludo
Date: Mon Sep 6 07:58:13 2010
New Revision: 23657
URL: https://svn.nixos.org/websvn/nix/?rev=23657&sc=1
Log:
org-mode: Pass the full path to `which'; use `callPackage'.
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/default.nix Mon Sep
6 07:29:18 2010 (r23656)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/default.nix Mon Sep
6 07:58:13 2010 (r23657)
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, texinfo }:
+{ fetchurl, stdenv, emacs, texinfo, which }:
stdenv.mkDerivation rec {
name = "org-7.01f";
@@ -10,6 +10,10 @@
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"
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 6 07:29:18
2010 (r23656)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 6 07:58:13
2010 (r23657)
@@ -5430,9 +5430,7 @@
# 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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
