diff options
author | Robert Djubek <envy1988@gmail.com> | 2020-02-09 03:39:23 +0000 |
---|---|---|
committer | Robert Djubek <envy1988@gmail.com> | 2020-02-09 05:20:32 +0000 |
commit | bef28375792fea807b7fd0ad72a58b59ab1f3865 (patch) | |
tree | 59a616bc293b5dd5081f0672cde6cb02f9b82dad | |
parent | 4ced5611dbcfea889a0282472a7e758bbc1edf78 (diff) |
scribusUnstable: Fix build with Poppler 0.84
see: https://github.com/NixOS/nixpkgs/pull/77186#issuecomment-583800213 it seems poppler updates (almost?) always break scribusUnstable additionally: formatted with nixpkgs-fmt; added kiwi to maintainers - the more eyes the better; add additional licenses that are listed on scribus COPYING;
-rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 112 | ||||
-rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 2 |
2 files changed, 92 insertions, 22 deletions
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 2a602b094ba29..faff45c8884a7 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,12 +1,41 @@ -{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, -boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, -podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }: +{ boost +, cairo +, cmake +, cups +, fetchpatch +, fetchurl +, fontconfig +, freetype +, harfbuzzFull +, hunspell +, lcms2 +, libjpeg +, libtiff +, libxml2 +, mkDerivation +, pixman +, pkgconfig +, podofo +, poppler +, poppler_data +, python2 +, qtbase +, qtimageformats +, qttools +, stdenv +}: let - pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); + pythonEnv = python2.withPackages ( + ps: [ + ps.pillow + ps.tkinter + ] + ); in mkDerivation rec { pname = "scribus"; + version = "1.5.5"; src = fetchurl { @@ -16,31 +45,72 @@ mkDerivation rec { patches = [ # fix build with Poppler 0.82 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; - sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; - }) + ( + fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; + sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; + } + ) # fix build with Poppler 0.83 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; - sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; - }) + ( + fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; + sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; + } + ) + # fix build with Poppler 0.84 + # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version + ( + fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; + sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; + } + ) ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + buildInputs = [ - qtbase cairo pixman boost cups fontconfig - freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler - poppler_data pythonEnv qtimageformats qttools harfbuzzFull + boost + cairo + cups + fontconfig + freetype + harfbuzzFull + hunspell + lcms2 + libjpeg + libtiff + libxml2 + pixman + podofo + poppler + poppler_data + pythonEnv + qtbase + qtimageformats + qttools ]; - meta = { - maintainers = [ stdenv.lib.maintainers.erictapen ]; - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + maintainers = with maintainers; [ + erictapen + kiwi + ]; + platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = http://www.scribus.net; - license = stdenv.lib.licenses.gpl2; + homepage = "http://www.scribus.net"; + # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 + license = with licenses; [ + bsd3 + gpl2 + mit + publicDomain + ]; }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index eb8ad5e1a796d..d21b4705b9783 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.84.0"; # beware: updates often break cups-filters build, check texlive too! + version = "0.84.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; |