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 @@
{ stdenv, fetchFromGitHub, autoconf, automake, boost
, zlib, libpng, libjpeg, libtiff, x11, SDL
, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ];
buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ];
# the installPhase wants to put files into $HOME. I let it put the files
# to $TMPDIR, so they don't get into the $out
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ];
enableParallelBuilding = true;
preInstall = ''
mkdir "$TMP/bin"
for i in chown chgrp; do