diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-06 00:02:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 00:02:16 +0000 |
| commit | b962dee3e746a3c55f04bc1f8a2719db0591bf9a (patch) | |
| tree | 9f187c2450762116d05c3b1e0a2f9947c88fc2f0 /pkgs/applications/graphics | |
| parent | a97b262ba614b2ee8379a08490d160d8e83a3528 (diff) | |
| parent | 44730d3be86d601d1d383da00e3511299d6671d1 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index d29d1d65346e5..75bfe5cff93d2 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -80,6 +80,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; }) + + # Fix build with poppler 22.04 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch"; + sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE="; + }) ]; postPatch = '' |