From 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Jul 2018 16:11:16 -0400 Subject: treewide: remove aliases in nixpkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkgs/applications/graphics/ktikz/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/graphics/ktikz') diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 8817071e98431..4b3a423a8ce23 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: +{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }: # Warning: You will also need a working pdflatex installation containing # at least auctex and pgf. @@ -64,8 +64,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext qt5.full poppler_qt5 ]; + buildInputs = [ gettext qt5.full poppler ]; enableParallelBuilding = true; } - -- cgit 1.4.1