diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
| commit | 11a9ac00fc34ca9948ae05c034fa730163626e40 (patch) | |
| tree | 90b3ed6837b3f97239f6efbe763929cdaaa5795b /pkgs/tools/typesetting | |
| parent | 563389a7fdd85b1ca1d4c6590785df62f52c8d6d (diff) | |
| parent | 6543c61311c0397775253dd3d7f1f41154fc6189 (diff) | |
| download | nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.gz nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.bz2 nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.lz nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.xz nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.zst nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/tools/networking/xh/default.nix
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/htmldoc/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 740d16c73df3..aaea9090b72e 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libpng, SystemConfiguration, Foundation }: +{ lib, stdenv, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config }: stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "0660829zjfdm6vzx14z7gvsfipsb7h0z74gbkyp2ncg3g2432s4n"; + sha256 = "1dqima0g3j301wwzjxdhzk5pvfj724rl615gf8ssxxajfnid1gl0"; }; - buildInputs = [ zlib libpng ] + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib libpng libjpeg ] ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; meta = with lib; { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; + changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ shanemikel ]; platforms = platforms.unix; |