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

Merge pull request #28580 from kiloreux/xpdf

Browse Source 
xpdf: 3.04-> 4.00
This commit is contained in:
Jörg Thalheim 2017-08-28 22:08:48 +01:00 committed by GitHub
commit a2fae4a5c5
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/misc/xpdf/default.nix
View File

@ -1,24 +1,28 @@
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
, base14Fonts ? null , cmake, qtbase ? null
}: }:
assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null; assert enableGUI -> qtbase != null && freetype != null;
assert enablePDFtoPPM -> freetype != null; assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null; assert useT1Lib -> t1lib != null;
assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xpdf-3.04"; name = "xpdf-4.00";
src = fetchurl { src = fetchurl {
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz; url = http://www.xpdfreader.com/dl/xpdf-4.00.tar.gz;
sha256 = "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i"; sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz";
}; };
nativeBuildInputs = [ cmake ];
cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"];
buildInputs = [ zlib libpng ] ++ buildInputs = [ zlib libpng ] ++
stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++ stdenv.lib.optional enableGUI qtbase ++
stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional useT1Lib t1lib ++
stdenv.lib.optional enablePDFtoPPM freetype; stdenv.lib.optional enablePDFtoPPM freetype;
@ -27,14 +31,6 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = "--enable-a4-paper";
postInstall = stdenv.lib.optionalString (base14Fonts != null) ''
substituteInPlace $out/etc/xpdfrc \
--replace /usr/local/share/ghostscript/fonts ${base14Fonts} \
--replace '#fontFile' fontFile
'';
meta = { meta = {
homepage = http://www.foolabs.com/xpdf/; homepage = http://www.foolabs.com/xpdf/;
description = "Viewer for Portable Document Format (PDF) files"; description = "Viewer for Portable Document Format (PDF) files";

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

@ -16957,9 +16957,7 @@ with pkgs;
apvlv = callPackage ../applications/misc/apvlv { }; apvlv = callPackage ../applications/misc/apvlv { };
xpdf = callPackage ../applications/misc/xpdf { xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };
base14Fonts = "${ghostscript}/share/ghostscript/fonts";
};
xkb_switch = callPackage ../tools/X11/xkb-switch { }; xkb_switch = callPackage ../tools/X11/xkb-switch { };