about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-modes/org
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2012-09-04 00:40:05 +0200
committerMathijs Kwik <mathijs@bluescreen303.nl>2012-09-04 17:49:31 +0200
commit2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5 (patch)
tree387afb57601c88b9b962b03c94d1f71f3f8f68b2 /pkgs/applications/editors/emacs-modes/org
parentb3c63a98f079fbcad2fa44b57c8edc8916362ba4 (diff)
downloadnixlib-2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5.tar
nixlib-2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5.tar.gz
nixlib-2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5.tar.bz2
nixlib-2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5.tar.lz
nixlib-2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5.tar.xz
nixlib-2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5.tar.zst
nixlib-2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5.zip
org-mode: upgrade to 7.9.1
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/org')
-rw-r--r--pkgs/applications/editors/emacs-modes/org/default.nix26
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index fb4de650ee01..d3829bc9d115 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,30 +1,24 @@
-{ fetchurl, stdenv, emacs, texinfo, which }:
+{ fetchurl, stdenv, emacs, texinfo, which, texLive }:
 
 stdenv.mkDerivation rec {
-  name = "org-7.8.03";
+  name = "org-7.9.1";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958";
+    sha256 = "0kz1dnzfpmmslwal150z9rxrnddjpaw2glx26qihpxzs0zzpw201";
   };
 
-  buildInputs = [ emacs texinfo ];
-
-  patchPhase =
-    '' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
-    '';
+  buildInputs = [ emacs ];
+  buildNativeInputs = [ texinfo texLive ];
 
   configurePhase =
-    '' sed -i Makefile \
-           -e "s|^prefix=.*$|prefix=$out|g"
+    '' sed -i mk/default.mk \
+           -e "s|^prefix\t=.*$|prefix=$out|g"
     '';
 
-  #XXX: fails because of missing UTILITIES/manfull.pl, currently not
-  # included in the release tarball, but git.
-
-  #postBuild =
-  #  '' make doc
-  #  '';
+  postBuild =
+    '' make doc
+    '';
 
   installPhase =
     '' make install install-info