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
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }:
let
pname = "PyQt-x11-gpl";
@@ -42,7 +42,7 @@ in buildPythonPackage {
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper qt4 lndir dbus_libs ];
buildInputs = [ makeWrapper qt4 lndir dbus ];
propagatedBuildInputs = [ sip ];