diff options
Diffstat (limited to 'pkgs/tools/typesetting')
21 files changed, 68 insertions, 68 deletions
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 1bcd07aceb5..1326c917593 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2 unzip ]; # install filters early, so their shebangs are patched too - patchPhase = with stdenv.lib; '' + patchPhase = with lib; '' mkdir -p "$out/etc/asciidoc/filters" mkdir -p "$out/etc/asciidoc/backends" '' + optionalString _enableDitaaFilter '' @@ -239,7 +239,7 @@ stdenv.mkDerivation rec { # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # We can remove PATH= when those impurities are fixed. # TODO: Is this still necessary when using texlive? - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ texlive coreutils gnused ]}')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${lib.makeBinPath [ texlive coreutils gnused ]}')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ @@ -259,7 +259,7 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/etc/vim"; - makeFlags = stdenv.lib.optional stdenv.isCygwin "DESTDIR=/."; + makeFlags = lib.optional stdenv.isCygwin "DESTDIR=/."; meta = with lib; { description = "Text-based document generation system"; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index ac0220cf561..992da3578e5 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, perlPackages, shortenPerlShebang, texlive }: let - biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); + biberSource = lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); # perl 5.32.0 ships with U:C 1.27 UnicodeCollate_1_29 = perlPackages.buildPerlPackage rec { @@ -35,9 +35,9 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/biber ''; diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index 4e76fb87a6b..351fbe75bd4 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, djvulibre, ghostscript, which }: +{ lib, stdenv, makeWrapper, fetchurl, djvulibre, ghostscript, which }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin - wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]} + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${lib.makeBinPath [ ghostscript djvulibre which ]} mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Convert DjVu files to PDF files"; homepage = "https://0x2a.at/s/projects/djvu2pdf"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; inherit version; }; } diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index b6b56e83688..91d8f6f8d32 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf" wrapProgram "$out/bin/docbook2odf" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \ + --prefix PATH : "${lib.makeBinPath [ zip libxslt ]}" \ --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}" ''; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 60f58a361df..a9d062dfbe4 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = stdenv.lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip; + nativeBuildInputs = lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip; installPhase = '' mkdir -p $out/bin $out/share/kindlegen/doc diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index d86c4908f21..eaeaeb40606 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghostscript}: +{lib, stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { name = "lout-3.40"; @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { # Wiki: https://sourceforge.net/p/lout/wiki/ homepage = "https://savannah.nongnu.org/projects/lout/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index be7d4c95833..70f7e8f53ca 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmark"; @@ -19,8 +19,8 @@ buildGoPackage rec { meta = { description = "A powerful markdown processor in Go geared towards the IETF"; homepage = "https://github.com/miekg/mmark"; - license = with stdenv.lib.licenses; bsd2; - maintainers = with stdenv.lib.maintainers; [ yrashk ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; bsd2; + maintainers = with lib.maintainers; [ yrashk ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 67c995f6c26..45be0709322 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation { homepage = "https://fletcherpenney.net/multimarkdown/"; # licensed under GPLv2+ or MIT: # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE - license = with stdenv.lib.licenses; [ gpl2Plus mit ]; + license = with lib.licenses; [ gpl2Plus mit ]; platforms = platforms.all; - maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + maintainers = with lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e445cf78d7a..fc240f16ec8 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: +{ lib, stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: stdenv.mkDerivation rec { pname = "pdfgrep"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "Commandline utility to search text in PDF files"; homepage = "https://pdfgrep.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ qknight fpletz ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qknight fpletz ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index de3cc7f64e8..10f8525da08 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp -p pdfsandwich $out/bin - wrapProgram $out/bin/pdfsandwich --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]} + wrapProgram $out/bin/pdfsandwich --prefix PATH : ${lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]} mkdir -p $out/man/man1 cp -p pdfsandwich.1.gz $out/man/man1 diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix index 5caafa054cf..3c4d042097f 100644 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gcj, unzip }: +{ fetchurl, lib, stdenv, gcj, unzip }: stdenv.mkDerivation { name = "pdftk-2.02"; @@ -35,9 +35,9 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; homepage = "https://www.pdflabs.com/tools/pdftk-server/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [raskin]; + platforms = with lib.platforms; linux; broken = true; # Broken on Hydra since 2020-08-24 }; } diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index e28fd9a7eaf..db4fb9d0f72 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -63,17 +63,17 @@ stdenv.mkDerivation rec { libiconv luaEnv ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; checkInputs = [ poppler_utils ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = stdenv.lib.optionalString stdenv.cc.isClang '' + preBuild = lib.optionalString stdenv.cc.isClang '' substituteInPlace libtexpdf/dpxutil.c \ --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);" ''; diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 0e90e1cf614..dc4a87c8859 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gettext @@ -18,7 +18,7 @@ let pname = "skribilo"; version = "0.9.5"; - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation { inherit pname version; @@ -42,7 +42,7 @@ in stdenv.mkDerivation { --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "The Ultimate Document Programming Framework"; longDescription = '' Skribilo is a free document production tool that takes a diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 663f12611b1..07c972420ab 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = let - binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; + binPath = lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; in '' mkdir -p $out/bin cp sshlatex $out/bin @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { purely local setting. ''; homepage = "https://github.com/iblech/sshlatex"; - license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus + platforms = lib.platforms.all; maintainers = [ maintainers.iblech ]; }; } diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f22840e2d86..0ad82b87c0c 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig harfbuzz openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' install -D dist/appimage/tectonic.desktop -t $out/share/applications/ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index 0fc2427588f..408af2204f2 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pushd $out/share/Ted/examples for f in rtf2*.sh do - makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ ghostscript ]} + makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${lib.makeBinPath [ ghostscript ]} done popd diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 38a33313249..6a9a2cb464c 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, emacs, texlive, ghostscript }: - +{ lib, stdenv, fetchurl, emacs, texlive, ghostscript }: + let auctex = stdenv.mkDerivation ( rec { version = "12.3"; @@ -30,8 +30,8 @@ let auctex = stdenv.mkDerivation ( rec { meta = { description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; homepage = "https://www.gnu.org/software/auctex"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; }); diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 1f6939e1b11..989f49b6d9a 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, libxslt, texlive +{ lib, 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 @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ python2 libxslt tex ] - ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ]; + ++ lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have # that yet. In Ubuntu, texindy is a part of the xindy package. preConfigure = '' sed -i 's|self.install_layout == "deb"|False|' setup.py - '' + stdenv.lib.optionalString enableAllFeatures '' + '' + lib.optionalString enableAllFeatures '' for file in $(find -name "*.py"); do sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \ -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = "http://dblatex.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index db0a4c01602..0f6bf5d0d55 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; # fixes "error: conflicting types for 'calloc'", etc. - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i 57d texk/kpathsea/c-std.h ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation { "--without-oxdvik" "--without-texinfo" "--without-texi2html" "--with-system-zlib" "--with-system-pnglib" "--with-system-ncurses" ] # couldn't get gsftopk working on darwin - ++ stdenv.lib.optional stdenv.isDarwin "--without-gsftopk"; + ++ lib.optional stdenv.isDarwin "--without-gsftopk"; postUnpack = '' mkdir -p $out/share/texmf diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 3b09bc4a55a..5fbc456ab21 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -145,7 +145,7 @@ core = stdenv.mkDerivation rec { meta = with lib; { description = "Basic binaries for TeX Live"; homepage = "http://www.tug.org/texlive"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; }; @@ -169,13 +169,13 @@ core-big = stdenv.mkDerivation { #TODO: upmendex ++ map (prog: "--disable-${prog}") # don't build things we already have ([ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "pdftex" "web-progs" "synctex" - ] ++ stdenv.lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]); + ] ++ lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]); configureScript = ":"; # we use static libtexlua, because it's only used by a single binary postConfigure = let - luajit = stdenv.lib.optionalString withLuaJIT ",luajit"; + luajit = lib.optionalString withLuaJIT ",luajit"; in '' mkdir ./WorkDir && cd ./WorkDir for path in libs/{teckit,lua53${luajit}} texk/web2c; do @@ -220,7 +220,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex mv "$out/bin"/{luatex,texlua,texluac} "$luatex/bin/" mv "$out/bin"/luahbtex "$luahbtex/bin/" mv "$out/bin"/xetex "$xetex/bin/" - '' + stdenv.lib.optionalString withLuaJIT '' + '' + lib.optionalString withLuaJIT '' mv "$out/bin"/mfluajit{,-nowin} "$mflua/bin/" mv "$out/bin"/{luajittex,luajithbtex,texluajit,texluajitc} "$luajittex/bin/" '' ; @@ -294,11 +294,11 @@ latexindent = perlPackages.buildPerlPackage rec { pname = "latexindent"; inherit (src) version; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); outputs = [ "out" ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; postPatch = '' @@ -315,7 +315,7 @@ latexindent = perlPackages.buildPerlPackage rec { install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent mkdir -p "$out"/${perl.libPrefix} cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/ - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang "$out"/bin/latexindent ''; }; @@ -325,7 +325,7 @@ pygmentex = python2Packages.buildPythonApplication rec { pname = "pygmentex"; inherit (src) version; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); propagatedBuildInputs = with python2Packages; [ pygments chardet ]; @@ -361,7 +361,7 @@ pygmentex = python2Packages.buildPythonApplication rec { texlinks = stdenv.mkDerivation rec { name = "texlinks.sh"; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); dontBuild = true; doCheck = false; @@ -425,7 +425,7 @@ xdvi = stdenv.mkDerivation { } # un-indented -// stdenv.lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062) +// lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062) { xindy = stdenv.mkDerivation { diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 31b260d846c..73007b13719 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, libxslt +{ fetchurl, lib, stdenv, libxml2, libxslt , docbook_xml_dtd_45, docbook_xsl, w3m , bash, getopt, makeWrapper }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xmlto" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}" + --prefix PATH : "${lib.makeBinPath [ libxslt libxml2 getopt ]}" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { necessary post-processing. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://fedorahosted.org/xmlto/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } |