diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2016-01-08 20:01:36 +0100 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2016-01-08 20:01:36 +0100 |
commit | 9948d44b4046823264983055a93cc09cad029f55 (patch) | |
tree | 893a1f6fe0c1fdabc8c68ce929516769760db27f /pkgs/applications/editors/emacs-modes/org | |
parent | 3769692a38ccaefec89e7172c35ed806a907563e (diff) | |
download | nixlib-9948d44b4046823264983055a93cc09cad029f55.tar nixlib-9948d44b4046823264983055a93cc09cad029f55.tar.gz nixlib-9948d44b4046823264983055a93cc09cad029f55.tar.bz2 nixlib-9948d44b4046823264983055a93cc09cad029f55.tar.lz nixlib-9948d44b4046823264983055a93cc09cad029f55.tar.xz nixlib-9948d44b4046823264983055a93cc09cad029f55.tar.zst nixlib-9948d44b4046823264983055a93cc09cad029f55.zip |
emacsPackages.org: use new texlive infrastructure
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/org')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/org/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index f7289a3b400c..416c0fd8a629 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,5 +1,4 @@ -{ fetchurl, stdenv, emacs, texinfo, which, texLive, texLiveCMSuper -, texLiveAggregationFun }: +{ fetchurl, stdenv, emacs, texinfo, which, texlive }: stdenv.mkDerivation rec { name = "org-8.3.2"; @@ -10,7 +9,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ emacs ]; - nativeBuildInputs = [ (texLiveAggregationFun { paths=[ texinfo texLive texLiveCMSuper ]; }) ]; + nativeBuildInputs = [ (texlive.combine { + inherit (texlive) scheme-small cm-super; + }) texinfo ]; configurePhase = '' sed -i mk/default.mk \ |