summary refs log tree commit diff
path: root/pkgs/tools/typesetting/asciidoc
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-01-15 16:19:50 +0700
committerBen Siraphob <bensiraphob@gmail.com>2021-01-15 17:12:36 +0700
commit8c5d37129fc5097d9fb52e95fb07de75392d1c3c (patch)
tree40cfd341b87811008151e9ecf053cf7449574b98 /pkgs/tools/typesetting/asciidoc
parent94f36839357387fd711d17d762d88c69767f265b (diff)
downloadnixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar
nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.gz
nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.bz2
nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.lz
nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.xz
nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.zst
nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.zip
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/typesetting/asciidoc')
-rw-r--r--pkgs/tools/typesetting/asciidoc/default.nix6
1 files changed, 3 insertions, 3 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";