summary refs log tree commit diff
path: root/pkgs/tools/text
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/text
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/text')
-rw-r--r--pkgs/tools/text/zimwriterfs/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index 5a5757bf2f2..085331ce0d5 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -8,7 +8,7 @@
 
 , file
 , icu
-, libgumbo
+, gumbo
 , lzma
 , xapian
 , zimlib
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-  buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
+  buildInputs = [ file icu gumbo lzma zimlib zlib xapian ];
   setSourceRoot = ''
     sourceRoot=$(echo */zimwriterfs)
   '';