ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 21:57:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36191 from veprbl/xpdf_fixes

Browse Source 
xpdf: fix icons on Darwin
This commit is contained in:
Daiderd Jordan 2018-03-02 08:28:06 +01:00 committed by GitHub
commit c863a43918
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
, stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
, cmake, qtbase ? null, makeWrapper , cmake, qtbase ? null, qtsvg ? null, makeWrapper
}: }:
assert enableGUI -> qtbase != null && freetype != null; assert enableGUI -> qtbase != null && qtsvg != null && freetype != null;
assert enablePDFtoPPM -> freetype != null; assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null; assert useT1Lib -> t1lib != null;
@ -38,7 +38,7 @@ stdenv.mkDerivation {
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
wrapProgram $out/bin/xpdf \ wrapProgram $out/bin/xpdf \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
''; '';
meta = { meta = {