diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-30 19:47:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 19:47:03 +0100 |
| commit | 8d73f87620eeb49dfc10814049c11bfef7e9e940 (patch) | |
| tree | 140eb8dc95203fd8fa298cc9610b675f3f575089 /pkgs/applications/office | |
| parent | ac72629607dbdbfda0ed399439df62605749c20d (diff) | |
| parent | 283e178e6c3667c5b8527a5bb603d8b6ae2e384e (diff) | |
Merge pull request #147416 from erictapen/scribusUnstable
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 549865cd8d857..6aed41d7f9afd 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -3,6 +3,7 @@ , cmake , cups , fetchurl +, fetchpatch , fontconfig , freetype , harfbuzzFull @@ -42,6 +43,19 @@ mkDerivation rec { sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4="; }; + patches = [ + # For harfbuzz >= 2.9.0 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch"; + sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4="; + }) + # For harfbuzz >= 3.0 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch"; + sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -77,10 +91,11 @@ mkDerivation rec { platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = "https://www.scribus.net"; - # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 + # There are a lot of licenses... + # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 license = with licenses; [ bsd3 - gpl2 + gpl2Plus mit publicDomain ]; |