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,5 +1,5 @@
{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3,
openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3,
libsodium, postgresql, ... }:
let
@@ -41,10 +41,10 @@ in
};
dbus = attrs: {
buildInputs = [ pkgconfig dbus_libs ];
buildInputs = [ pkgconfig dbus ];
};
libdbus-sys = attrs: {
buildInputs = [ pkgconfig dbus_libs ];
buildInputs = [ pkgconfig dbus ];
};
gobject-sys = attrs: {
buildInputs = [ dbus-glib ];