public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66847 from ivanbrennan/wkhtmltopdf

Browse Source 
wkhtmltopdf: use qt5's own mkDerivation
This commit is contained in:
worldofpeace 2019-08-18 17:34:49 -04:00 committed by GitHub
commit 2a7542c514
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/graphics/wkhtmltopdf/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, qt5, fontconfig, freetype, libpng, zlib, libjpeg { mkDerivation, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns
, fontconfig, freetype, libpng, zlib, libjpeg
, openssl, libX11, libXext, libXrender }: , openssl, libX11, libXext, libXrender }:
stdenv.mkDerivation rec { mkDerivation rec {
version = "0.12.5"; version = "0.12.5";
name = "wkhtmltopdf-${version}"; name = "wkhtmltopdf-${version}";
@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
fontconfig freetype libpng zlib libjpeg openssl fontconfig freetype libpng zlib libjpeg openssl
libX11 libXext libXrender libX11 libXext libXrender
qt5.qtwebkit qt5.qtsvg qt5.qtxmlpatterns qtwebkit qtsvg qtxmlpatterns
]; ];
prePatch = '' prePatch = ''
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
homepage = https://wkhtmltopdf.org/; homepage = https://wkhtmltopdf.org/;
description = "Tools for rendering web pages to PDF or images"; description = "Tools for rendering web pages to PDF or images";
longDescription = '' longDescription = ''

2
pkgs/top-level/all-packages.nix
View File

@ -6966,7 +6966,7 @@ in
wireguard-go = callPackage ../tools/networking/wireguard-go { }; wireguard-go = callPackage ../tools/networking/wireguard-go { };
wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { };
wml = callPackage ../development/web/wml { }; wml = callPackage ../development/web/wml { };