summary refs log tree commit diff
path: root/doc/default.nix
diff options
context:
space:
mode:
authorMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-17 16:11:16 -0400
committerMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-18 23:25:20 -0400
commit76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch)
tree0325a27e51eb7bed006c1ef958e6312ac1d995c4 /doc/default.nix
parentd7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff)
downloadnixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
Diffstat (limited to 'doc/default.nix')
-rw-r--r--doc/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/default.nix b/doc/default.nix
index f99aaff5f8a..fa2e4a88738 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
   # $ nix-shell --run "make clean all"
   # otherwise they won't reapply :)
   HIGHLIGHTJS = pkgs.documentation-highlighter;
-  XSL = "${pkgs.docbook5_xsl}/xml/xsl";
+  XSL = "${pkgs.docbook_xsl_ns}/xml/xsl";
   RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
   XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
   xsltFlags = lib.concatStringsSep " " [