From 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Tue, 17 Jul 2018 16:11:16 -0400
Subject: treewide: remove aliases in nixpkgs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/networking/browsers/firefox-bin')

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6a5c9d67470c..570180d4c4df 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -5,7 +5,7 @@
 , curl
 , cups
 , dbus-glib
-, dbus_libs
+, dbus
 , fontconfig
 , freetype
 , gconf
@@ -93,7 +93,7 @@ stdenv.mkDerivation {
       curl
       cups
       dbus-glib
-      dbus_libs
+      dbus
       fontconfig
       freetype
       gconf
-- 
cgit 1.4.1