diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-16 16:56:19 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-16 16:56:19 +0100 |
commit | 82f947c78a0de94c72abee4f9bb2706a14169bac (patch) | |
tree | d0f2d320dd08de456031e39d353443f25cc1abdf /pkgs/tools | |
parent | 1f000ba42732e2d5a58576d2359819640d13b506 (diff) | |
download | nixlib-82f947c78a0de94c72abee4f9bb2706a14169bac.tar nixlib-82f947c78a0de94c72abee4f9bb2706a14169bac.tar.gz nixlib-82f947c78a0de94c72abee4f9bb2706a14169bac.tar.bz2 nixlib-82f947c78a0de94c72abee4f9bb2706a14169bac.tar.lz nixlib-82f947c78a0de94c72abee4f9bb2706a14169bac.tar.xz nixlib-82f947c78a0de94c72abee4f9bb2706a14169bac.tar.zst nixlib-82f947c78a0de94c72abee4f9bb2706a14169bac.zip |
runLaTeX: Fix dependency detection
Since Nix 1.4, expressions like "${path}/blabla" always evaluate to a string rather than a path. However, findLaTeXIncludes depended on the old (weird) behaviour, leading to errors like: error: string `/nix/store/4c32q75in74m1148anlzdhb8jpppab0s-bla/IEEEtran.cls' cannot refer to other paths So use path concatenation instead.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 9ae567e635b7..223f72c67855 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -66,7 +66,7 @@ rec { else if dep.type == "tex" then [".tex" ""] else [""]; fn = pkgs.lib.findFirst (fn: builtins.pathExists fn) null - (map (ext: "${dirOf key}/${dep.name}${ext}") exts); + (map (ext: dirOf key + ("/" + dep.name + ext)) exts); in if fn != null then [{key = fn;}] ++ xs else xs; @@ -90,8 +90,8 @@ rec { { src = key; } "${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}"); - in pkgs.lib.concatMap (x : if builtins.pathExists x then [{key = x;}] else []) - (map (x : "${dirOf key}/${x}") deps); + in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else []) + (map (x: dirOf key + ("/" + x)) deps); }; dot2pdf = |