diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
commit | 51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch) | |
tree | 0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/applications/misc/xpdf | |
parent | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff) | |
download | nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2 nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip |
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/misc/xpdf')
-rw-r--r-- | pkgs/applications/misc/xpdf/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index eb76448391e..d524482dee7 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -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"; |