From a3c57acef4a0c7ade1e1ee5a5deed748a90da2f9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 1 Mar 2018 16:40:10 -0500 Subject: [PATCH] xpdf: specify paths to Qt plugins On Darwing this fixes icons and "native" look. Fixes: #36188 --- pkgs/applications/misc/xpdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 42622b62f61b..3b05c9be451f 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , 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 useT1Lib -> t1lib != null; @@ -38,7 +38,7 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optionalString stdenv.isDarwin '' 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 = {