xpdf: build with qt gui

+11 -17
+8 -12
pkgs/applications/misc/xpdf/default.nix
··· 1 1 { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false 2 - , stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null 3 - , base14Fonts ? null 2 + , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null 3 + , cmake, qtbase ? null 4 4 }: 5 5 6 - assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null; 6 + assert enableGUI -> qtbase != null && freetype != null; 7 7 assert enablePDFtoPPM -> freetype != null; 8 8 assert useT1Lib -> t1lib != null; 9 9 ··· 16 16 url = http://www.xpdfreader.com/dl/xpdf-4.00.tar.gz; 17 17 sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz"; 18 18 }; 19 + 20 + nativeBuildInputs = [ cmake ]; 21 + 22 + cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"]; 19 23 20 24 buildInputs = [ zlib libpng ] ++ 21 - stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++ 25 + stdenv.lib.optional enableGUI qtbase ++ 22 26 stdenv.lib.optional useT1Lib t1lib ++ 23 27 stdenv.lib.optional enablePDFtoPPM freetype; 24 28 ··· 26 30 CXXFLAGS = "-O2 -fpermissive"; 27 31 28 32 hardeningDisable = [ "format" ]; 29 - 30 - configureFlags = "--enable-a4-paper"; 31 - 32 - postInstall = stdenv.lib.optionalString (base14Fonts != null) '' 33 - substituteInPlace $out/etc/xpdfrc \ 34 - --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \ 35 - --replace '#fontFile' fontFile 36 - ''; 37 33 38 34 meta = { 39 35 homepage = http://www.foolabs.com/xpdf/;
+3 -5
pkgs/top-level/all-packages.nix
··· 11098 11098 dex-oidc = callPackage ../servers/dex { }; 11099 11099 11100 11100 dgraph = callPackage ../servers/dgraph { }; 11101 - 11101 + 11102 11102 dico = callPackage ../servers/dico { }; 11103 11103 11104 11104 dict = callPackage ../servers/dict { ··· 16924 16924 16925 16925 apvlv = callPackage ../applications/misc/apvlv { }; 16926 16926 16927 - xpdf = callPackage ../applications/misc/xpdf { 16928 - base14Fonts = "${ghostscript}/share/ghostscript/fonts"; 16929 - }; 16927 + xpdf = libsForQt5.callPackage ../applications/misc/xpdf { }; 16930 16928 16931 16929 xkb_switch = callPackage ../tools/X11/xkb-switch { }; 16932 16930 ··· 18684 18682 hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; 18685 18683 18686 18684 hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; 18687 - 18685 + 18688 18686 epkowa = callPackage ../misc/drivers/epkowa { }; 18689 18687 18690 18688 illum = callPackage ../tools/system/illum { };