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 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc
, ethtool, nettools, libnl, libudev, python, perl
, ethtool, nettools, libnl, udev, python, perl
} :
let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake pkgconfig pandoc ];
buildInputs = [ libnl ethtool nettools libudev python perl ];
buildInputs = [ libnl ethtool nettools udev python perl ];
cmakeFlags = [
"-DCMAKE_INSTALL_RUNDIR=/run"
@@ -37,4 +37,3 @@ in stdenv.mkDerivation {
maintainers = with maintainers; [ markuskowa ];
};
}