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
+3 -3
View File
@@ -1,5 +1,5 @@
{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus
, withWebSockets ? false, qtwebsockets
, withConnectivity ? false, qtconnectivity
}:
@@ -32,7 +32,7 @@ in buildPythonPackage {
nativeBuildInputs = [ pkgconfig qmake lndir ];
buildInputs = [ dbus_libs ];
buildInputs = [ dbus ];
propagatedBuildInputs = [
sip qtbase qtsvg qtwebkit qtwebengine
@@ -53,7 +53,7 @@ in buildPythonPackage {
${python.executable} configure.py -w \
--confirm-license \
--dbus=${dbus_libs.dev}/include/dbus-1.0 \
--dbus=${dbus.dev}/include/dbus-1.0 \
--no-qml-plugin \
--bindir=$out/bin \
--destdir=$out/${python.sitePackages} \