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, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus
, telepathy-farstream, telepathy-glib, fetchpatch }:
let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig python ];
propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
buildInputs = [ dbus-glib ];
checkInputs = [ dbus_daemon dbus-python ];
checkInputs = [ dbus.daemon dbus-python ];
patches = [
# https://github.com/TelepathyIM/telepathy-qt/issues/25