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
@@ -5,7 +5,7 @@
, readline, sqlite
, disableDocs ? false
, CoreFoundation
, gsettings_desktop_schemas
, gsettings-desktop-schemas
}:
let
@@ -20,7 +20,7 @@ let
glib
gmp
gtk3
gsettings_desktop_schemas
gsettings-desktop-schemas
libedit
libjpeg
libpng
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
(stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
];
buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ]
buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
preConfigure = ''