aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/applications/office/scribus/unstable.nix
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/office/scribus/unstable.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/office/scribus/unstable.nix45
1 files changed, 4 insertions, 41 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/scribus/unstable.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/scribus/unstable.nix
index ff69329140bf..c2c300b87486 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/office/scribus/unstable.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/office/scribus/unstable.nix
@@ -18,7 +18,7 @@
, podofo
, poppler
, poppler_data
-, python2
+, python3
, qtbase
, qtimageformats
, qttools
@@ -26,7 +26,7 @@
}:
let
- pythonEnv = python2.withPackages (
+ pythonEnv = python3.withPackages (
ps: [
ps.pillow
ps.tkinter
@@ -36,50 +36,13 @@ in
mkDerivation rec {
pname = "scribus";
- version = "1.5.5";
+ version = "1.5.6.1";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
- sha256 = "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r";
+ sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
};
- patches = [
- # Poppler patches from
- # https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf
-
- # fix build with Poppler 0.82
- (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";
- })
- # 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";
- })
- # Formating changes needed for the Poppler 0.86 patch to apply
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch";
- sha256 = "16n3wch2mkabgkb06iywggdkckr4idrw4in56k5jh2jqjl0ra2db";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch";
- sha256 = "0g6l3qc75wiykh59059ajraxjczh11wkm68942d0skl144i893rr";
- includes = [ "scribus/plugins/import/pdf/*" ];
- })
- # fix build with Poppler 0.86
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch";
- sha256 = "1lszpzlpgdhm79nywvqji25aklfhzb2qfsfiyld7yv51h82zwp77";
- })
- ];
-
enableParallelBuilding = true;
nativeBuildInputs = [