wrapQtAppsHook: Remove ad hoc Qt wrappers
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
|
||||
, stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
|
||||
, cmake, qtbase ? null, qtsvg ? null, makeWrapper
|
||||
, cmake, qtbase ? null, qtsvg ? null, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
assert enableGUI -> qtbase != null && qtsvg != null && freetype != null;
|
||||
@@ -22,7 +22,9 @@ stdenv.mkDerivation {
|
||||
# https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html
|
||||
patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch;
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
nativeBuildInputs =
|
||||
[ cmake ]
|
||||
++ stdenv.lib.optional enableGUI wrapQtAppsHook;
|
||||
|
||||
cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"];
|
||||
|
||||
@@ -36,11 +38,6 @@ stdenv.mkDerivation {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableGUI) ''
|
||||
wrapProgram $out/bin/xpdf \
|
||||
--set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.xpdfreader.com;
|
||||
description = "Viewer for Portable Document Format (PDF) files";
|
||||
|
||||
Reference in New Issue
Block a user