From b08c00f67d675a9679ddcde6df8c9aeaa457de97 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Oct 2016 17:03:59 +0200 Subject: [PATCH] dblatex: use python2 --- pkgs/tools/typesetting/tex/dblatex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index ce65a587ddf2..7ffccde2c035 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, libxslt, texlive +{ stdenv, fetchurl, python2, libxslt, texlive , enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr"; }; - buildInputs = [ python libxslt tex ] + buildInputs = [ python2 libxslt tex ] ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - python ./setup.py install --prefix="$out" --use-python-path --verbose + ${python2.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose ''; passthru = { inherit tex; };