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
This commit is contained in:
Matthew Bauer
2018-07-18 23:25:20 -04:00
parent d7d31fea7e
commit 76999cc40e
167 changed files with 460 additions and 445 deletions
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns,
karchive, ki18n, qtbase,
perl, perlPackages
}:
@@ -24,7 +24,7 @@ mkDerivation {
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
"-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook"
];
postFixup = ''
moveToOutput "share/doc" "$dev"