diff options
| author | Peter Simons <simons@cryp.to> | 2013-10-22 13:01:41 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-22 13:02:21 +0200 |
| commit | 757161cb8136ba4e004c92e2c82eec7971b2eea9 (patch) | |
| tree | cfe59e4f1d1182a77fb9985e420aa462da284f3c /pkgs/applications/misc/xpdf | |
| parent | 897329fc479c4a7d33cdb09fc504541a3020a4df (diff) | |
| download | nixpkgs-757161cb8136ba4e004c92e2c82eec7971b2eea9.tar nixpkgs-757161cb8136ba4e004c92e2c82eec7971b2eea9.tar.gz nixpkgs-757161cb8136ba4e004c92e2c82eec7971b2eea9.tar.bz2 nixpkgs-757161cb8136ba4e004c92e2c82eec7971b2eea9.tar.lz nixpkgs-757161cb8136ba4e004c92e2c82eec7971b2eea9.tar.xz nixpkgs-757161cb8136ba4e004c92e2c82eec7971b2eea9.tar.zst nixpkgs-757161cb8136ba4e004c92e2c82eec7971b2eea9.zip | |
xpdf: fix configure-time bug that prevented the man pages from being installed
Diffstat (limited to 'pkgs/applications/misc/xpdf')
| -rw-r--r-- | pkgs/applications/misc/xpdf/default.nix | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 5218df77595..fdcdd4770d0 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -18,26 +18,20 @@ stdenv.mkDerivation { }; buildInputs = - (if enableGUI then [x11 motif] else []) ++ - (if useT1Lib then [t1lib] else []); + stdenv.lib.optionals enableGUI [x11 motif] ++ + stdenv.lib.optional useT1Lib t1lib ++ + stdenv.lib.optional enablePDFtoPPM freetype; # Debian uses '-fpermissive' to bypass some errors on char* constantness. CXXFLAGS = "-O2 -fpermissive"; - configureFlags = - "--infodir=$out/share/info --mandir=$out/share/man --enable-a4-paper" - + (if enablePDFtoPPM then - " --with-freetype2-library=${freetype}/lib" - + " --with-freetype2-includes=${freetype}/include/freetype2" - else ""); - - postInstall = " - if test -n \"${base14Fonts}\"; then - substituteInPlace $out/etc/xpdfrc \\ - --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\ - --replace '#fontFile' fontFile - fi - "; + 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 = { homepage = "http://www.foolabs.com/xpdf/"; |