diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-01-16 08:47:40 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-01-19 08:19:24 +0000 |
| commit | 5f12173f81e56deef7f51c3c599d582286d5f321 (patch) | |
| tree | 616da85f7903323e265e27e8f43bd52556d3b117 /pkgs/applications/graphics/inkscape | |
| parent | a29be1353f39dc104c4fb7e049571b75be9108d3 (diff) | |
inkscape: fix build against upcoming gcc-12
Without the change build fails as:
src/io/file.h:29:63: error: use of deleted function
'std::__cxx11::basic_string<...>::basic_string(std::nullptr_t) [...]'
29 | SPDocument* ink_file_new(const std::string &Template = nullptr);
| ^
Diffstat (limited to 'pkgs/applications/graphics/inkscape')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index d3546f6095207..24f3a555fd5af 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -88,7 +88,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch"; sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng="; }) - + # Fix build against gcc-12 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3683 + (fetchpatch { + name = "gcc-12.patch"; + url = "https://gitlab.com/inkscape/inkscape/-/commit/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch"; + sha256 = "sha256-VzKrWCkcVA1Co/xBTyh28Zhm2zFE/2jfZ3LveK0raO4="; + }) ]; postPatch = '' |