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,4 +1,4 @@
{stdenv, fetchurl, automake, autoconf, x11}:
{stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
stdenv.mkDerivation {
name = "libstroke-0.5.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d";
};
buildInputs = [ automake autoconf x11 ];
buildInputs = [ automake autoconf xlibsWrapper ];
# libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
# Also, modern automake doesn't like things and returns error code 63. But it generates the file.