git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147416 from erictapen/scribusUnstable
commit8d73f87620eeb49dfc10814049c11bfef7e9e940 authorSandro <sandro.jaeckel@gmail.com> dateTue 30 Nov 2021, 19:47 (5 years ago) parentac72629283e178
1 file changed+17−2
pkgs/applications/office/scribus/unstable.nix+17−2
pkgs/applications/office/scribus/unstable.nix+17−2
@@ -3,6 +3,7 @@
33, cmake
44, cups
55, fetchurl
6+, fetchpatch
67, fontconfig
78, freetype
89, harfbuzzFull
@@ -42,6 +43,19 @@ mkDerivation rec {
4243 sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
4344 };
4445
46+ patches = [
47+ # For harfbuzz >= 2.9.0
48+ (fetchpatch {
49+ url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
50+ sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
51+ })
52+ # For harfbuzz >= 3.0
53+ (fetchpatch {
54+ url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
55+ sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
56+ })
57+ ];
58+
4559 nativeBuildInputs = [
4660 cmake
4761 pkg-config
@@ -77,10 +91,11 @@ mkDerivation rec {
7791 platforms = platforms.linux;
7892 description = "Desktop Publishing (DTP) and Layout program for Linux";
7993 homepage = "https://www.scribus.net";
80− # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
94+ # There are a lot of licenses...
95+ # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
8196 license = with licenses; [
8297 bsd3
83− gpl2
98+ gpl2Plus
8499 mit
85100 publicDomain
86101 ];