From e3e0f79b9f2a349ab13b521e65ceaf0ce13a9671 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 10 Mar 2019 14:54:38 -0500 Subject: [PATCH] scribus: 1.4.7 -> 1.4.8, dep fixups * Needs hunspell not aspell, not sure when * bake in gs path to avoid warning on launch * python-pillow for print preview, per README https://www.scribus.net/scribus-1-4-8-released/ --- pkgs/applications/office/scribus/default.nix | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 434b4e64ee67..d6b73b07f0e5 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 , libart_lgpl, qt4, python2, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake, imagemagick }: +, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: let icon = fetchurl { @@ -8,27 +8,35 @@ let sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; }; - pythonEnv = python2.withPackages(ps: [ps.tkinter]); + pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); in stdenv.mkDerivation rec { - name = "scribus-1.4.7"; + pname = "scribus"; + version = "1.4.8"; src = fetchurl { - url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2"; + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = with xorg; - [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 + [ freetype lcms libtiff libxml2 libart_lgpl qt4 pythonEnv cups fontconfig - libjpeg zlib libpng podofo aspell cairo + libjpeg zlib libpng podofo hunspell cairo boost # for internal 2geom library libXaw libXext libX11 libXtst libXi libXinerama libpthreadstubs libXau libXdmcp imagemagick # To build the icon ]; + postPatch = '' + substituteInPlace scribus/util_ghostscript.cpp \ + --replace 'QString gsName("gs");' \ + 'QString gsName("${ghostscript}/bin/gs");' + ''; + postInstall = '' for i in 16 24 48 64 96 128 256 512; do mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps