summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-06-18 09:42:12 -0700
committerJohn Wiegley <johnw@newartisans.com>2014-06-18 09:42:12 -0700
commit4643126d10b59312e992f09345faa68707ea13b3 (patch)
tree078f695253cb2bada50caf022ccd3260b238791b /pkgs/applications
parentf7c72829648675f7d5bb6d3220d0fe0bb3091ac7 (diff)
parent63ee29b808c57b5dfa6a174cf64ff5e161530018 (diff)
downloadnixlib-4643126d10b59312e992f09345faa68707ea13b3.tar
nixlib-4643126d10b59312e992f09345faa68707ea13b3.tar.gz
nixlib-4643126d10b59312e992f09345faa68707ea13b3.tar.bz2
nixlib-4643126d10b59312e992f09345faa68707ea13b3.tar.lz
nixlib-4643126d10b59312e992f09345faa68707ea13b3.tar.xz
nixlib-4643126d10b59312e992f09345faa68707ea13b3.tar.zst
nixlib-4643126d10b59312e992f09345faa68707ea13b3.zip
Merge pull request #2938 from pSub/org-mode
Org-mode 8.2.7 depends on texlive-cm-super.
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/editors/emacs-modes/org/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 768444008ad4..776a817fc49d 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, emacs, texinfo, which, texLive }:
+{ fetchurl, stdenv, emacs, texinfo, which, texLive, texLiveCMSuper
+, texLiveAggregationFun }:
 
 stdenv.mkDerivation rec {
   name = "org-8.2.7";
@@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ emacs ];
-  nativeBuildInputs = [ texinfo texLive ];
+  nativeBuildInputs = [ (texLiveAggregationFun { paths=[ texinfo texLive texLiveCMSuper ]; }) ];
 
   configurePhase =
     '' sed -i mk/default.mk \