public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/nixpkgs/trunk/; revision=23657
This commit is contained in:
Ludovic Courtès 2010-09-06 07:58:13 +00:00
parent b724075063
commit 78adb9fbf1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs-modes/org/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, emacs, texinfo }: { fetchurl, stdenv, emacs, texinfo, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "org-7.01f"; name = "org-7.01f";
@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
buildInputs = [ emacs texinfo ]; buildInputs = [ emacs texinfo ];
patchPhase =
'' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
'';
configurePhase = configurePhase =
'' sed -i Makefile \ '' sed -i Makefile \
-e "s|^prefix=.*$|prefix=$out|g" -e "s|^prefix=.*$|prefix=$out|g"

4
pkgs/top-level/all-packages.nix
View File

@ -5430,9 +5430,7 @@ let
# This is usually a newer version of Org-Mode than that found in GNU Emacs, so # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
# we want it to have higher precedence. # we want it to have higher precedence.
org = hiPrio (import ../applications/editors/emacs-modes/org { org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
inherit fetchurl stdenv emacs texinfo;
});
prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; prologMode = callPackage ../applications/editors/emacs-modes/prolog { };