diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-06-10 11:25:03 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-06-10 11:25:03 +0400 |
| commit | a852b53bffecdba28344a7ccbe25b87e6cbd9344 (patch) | |
| tree | b97837df076454de7cc0790203508d1ebd4b768b | |
| parent | 26c8490ea1070b63f1a05e2d85efe540136660c9 (diff) | |
| download | nixlib-a852b53bffecdba28344a7ccbe25b87e6cbd9344.tar nixlib-a852b53bffecdba28344a7ccbe25b87e6cbd9344.tar.gz nixlib-a852b53bffecdba28344a7ccbe25b87e6cbd9344.tar.bz2 nixlib-a852b53bffecdba28344a7ccbe25b87e6cbd9344.tar.lz nixlib-a852b53bffecdba28344a7ccbe25b87e6cbd9344.tar.xz nixlib-a852b53bffecdba28344a7ccbe25b87e6cbd9344.tar.zst nixlib-a852b53bffecdba28344a7ccbe25b87e6cbd9344.zip | |
Add potrace to texLive dependencies
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index b1cb35e62ffd..73c53bca2fb0 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -112,7 +112,9 @@ rec { freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ] - ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ]; + ++ stdenv.lib.optionals (! stdenv.isDarwin) [ potrace ] + ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ] + ; configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ebbf7cd8ad3..3478e3a7cde0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11010,7 +11010,7 @@ let texFunctions = import ../tools/typesetting/tex/nix pkgs; texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { - inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby + inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo libjpeg bison python fontconfig flex poppler libpaper graphite2 makeWrapper; |