diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-17 18:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 18:01:06 +0000 |
| commit | c795e7ba4f07d886860031474c4bb17bcb25f08c (patch) | |
| tree | a632defffe924c4b3306b80347cd22bea1e2f003 /pkgs/applications/graphics | |
| parent | 4d125692e5585fe7d591eec9b7a781fbc15dcbdc (diff) | |
| parent | 4818f809a92b2ef8d8c002c10a29f1080106ee81 (diff) | |
| download | nixpkgs-c795e7ba4f07d886860031474c4bb17bcb25f08c.tar nixpkgs-c795e7ba4f07d886860031474c4bb17bcb25f08c.tar.gz nixpkgs-c795e7ba4f07d886860031474c4bb17bcb25f08c.tar.bz2 nixpkgs-c795e7ba4f07d886860031474c4bb17bcb25f08c.tar.lz nixpkgs-c795e7ba4f07d886860031474c4bb17bcb25f08c.tar.xz nixpkgs-c795e7ba4f07d886860031474c4bb17bcb25f08c.tar.zst nixpkgs-c795e7ba4f07d886860031474c4bb17bcb25f08c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index b93a0fcaff8..d3546f60952 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "share/extensions/"; }) + # Remove mandatory break from end of paragraphs, added in Pango 1.49 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 + # TODO: Remove in Inkscape 1.1.2 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch"; + sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng="; + }) + ]; postPatch = '' |