summary refs log tree commit diff
path: root/pkgs/tools/compression/pixz/default.nix
diff options
context:
space:
mode:
authorMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-17 16:11:16 -0400
committerMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-18 23:25:20 -0400
commit76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch)
tree0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/tools/compression/pixz/default.nix
parentd7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff)
downloadnixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip
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
Diffstat (limited to 'pkgs/tools/compression/pixz/default.nix')
-rw-r--r--pkgs/tools/compression/pixz/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix
index 2a5250a95ac..7eca80f8400 100644
--- a/pkgs/tools/compression/pixz/default.nix
+++ b/pkgs/tools/compression/pixz/default.nix
@@ -1,6 +1,6 @@
-{ 
+{
   stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
-  , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xml_xslt
+  , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl
   , libarchive, lzma
 }:
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     autoconf automake libtool asciidoc libxslt libxml2
-    docbook_xml_dtd_45 docbook_xml_xslt
+    docbook_xml_dtd_45 docbook_xsl
     libarchive lzma
   ];
   preBuild = ''