diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 83fd78c63134..8a40bac446e8 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,6 +5,7 @@ , cairo , cmake , fetchurl +, fetchpatch , gettext , ghostscript , glib @@ -78,6 +79,12 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix build with Poppler 22.09 + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch"; + sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc="; + }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index b5964adbbca9..eb0eaaeda95d 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , alsa-lib , appstream-glib +, clang +, cmake , desktop-file-utils , gio-sharp , glib @@ -22,24 +24,26 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-CZLZblC10k5ynzDDXi/bOe6Rc6M94eywXjyu0ABOVq4="; + hash = "sha256-w4y+t8idcaNwvC2Wp9SRjcd4m23Zt+yHG2fjOA2rBU8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Udat35KqrMWR0Ckx34BWoF0HiJHZ5CP2CGFD6FNCWRA="; + hash = "sha256-Hybbbokru4vz5ly3oZuNGdBa+lYbhdYjESUpRxIUqJc="; }; nativeBuildInputs = [ appstream-glib # For appstream-util + clang + cmake desktop-file-utils # For update-desktop-database meson ninja @@ -52,6 +56,8 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; + dontUseCmakeConfigure = true; + buildInputs = [ alsa-lib gio-sharp @@ -63,6 +69,8 @@ stdenv.mkDerivation rec { poppler ]; + LIBCLANG_PATH = "${clang.cc.lib}/lib"; + postPatch = '' pushd build-aux chmod +x meson_post_install.py diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d40c96ef486a..16e65d283645 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -63,6 +63,11 @@ mkDerivation rec { url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; }) + # For Poppler 22.09 + (fetchpatch { + url = "https://github.com/archlinux/svntogit-community/raw/ea402a588c65d11973b148cf203b3463213431cf/trunk/scribus-1.5.8-poppler-22.09.0.patch"; + sha256 = "IRQ6rSzH6ZWln6F13Ayk8k7ADj8l3lIJlGm/zjEURQM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 8ff218b79316..ccae3037e092 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , fetchFromGitLab , cairo , cmake @@ -43,28 +42,20 @@ let owner = "poppler"; repo = "test"; rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435"; - sha256 = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos="; + hash = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos="; }; in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "22.11.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs="; + hash = "sha256-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-38784.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch"; - sha256 = "sha256-M12zaHxcgQB/37tHffllqzd+Juq9BH5gpKVGaRY00vI="; - }) - ]; - nativeBuildInputs = [ cmake ninja