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

2 files changed, 8 insertions, 6 deletions

diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index c0f015944b0a..390f68bd105f 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }:
+{ stdenv, fetchurl, binutils, patchelf, makeWrapper
+, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
+, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
 
 stdenv.mkDerivation rec {
   name = "inboxer-${version}";
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
       expat
       stdenv.cc.cc.lib
       libpulseaudio
-      libudev
+      udev
     ];
   in ''
     patchelf \
@@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
     patchelf \
       --set-rpath "$out/opt/Inboxer:${lpath}" \
       $out/opt/Inboxer/libffmpeg.so
-   
+
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/opt/Inboxer:${lpath}" \
@@ -70,7 +72,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
   '';
-  
+
   installPhase = ''
     mkdir -p $out/bin
     cp -R usr/share opt $out/
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index bea713c9e6bd..b9b553f94472 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -7,7 +7,7 @@
 , cups
 , curl
 , dbus-glib
-, dbus_libs
+, dbus
 , fontconfig
 , freetype
 , gdk_pixbuf
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
       cups
       curl
       dbus-glib
-      dbus_libs
+      dbus
       fontconfig
       freetype
       gdk_pixbuf