From 23b5ac11e2181d087c884c6426591d7fdeb0962b Mon Sep 17 00:00:00 2001 From: arthsmn Date: Thu, 15 Jan 2026 12:18:09 -0300 Subject: [PATCH] scribus: 1.7.0 -> 1.7.2 --- pkgs/by-name/sc/scribus/package.nix | 48 ++++++----------------------- 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/sc/scribus/package.nix b/pkgs/by-name/sc/scribus/package.nix index 5281a5fa0323..b0c392d46904 100644 --- a/pkgs/by-name/sc/scribus/package.nix +++ b/pkgs/by-name/sc/scribus/package.nix @@ -3,11 +3,12 @@ cairo, cmake, cups, - fetchpatch, fetchurl, fontconfig, freetype, graphicsmagick, + gsettings-desktop-schemas, + gtk3, harfbuzzFull, hunspell, lcms2, @@ -38,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-+lnWIh/3z/qTcjV5l+hlcBYuHhiRNza3F2/RD0jCQ/Y="; + hash = "sha256-nY4RzGusLNlsVTnvvXGSIv9/cOHBhZcogNn7MFHhONA="; }; nativeBuildInputs = [ @@ -95,41 +96,12 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "WANT_GRAPHICSMAGICK" true) ]; - patches = [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_qt_6.9.0.patch?h=scribus-unstable"; - hash = "sha256-hzd9XpoVVqbwvZ40QPGBqqWkIFXug/tSojf/Ikc4nn4="; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_poppler_25.02.0.patch?h=scribus-unstable"; - hash = "sha256-t9xJA6KGMGAdUFyjI8OlTNilewyMr1FFM7vjHOM15Xg="; - }) - (fetchpatch { - name = "fix-build-poppler-25.06.0.patch"; - url = "https://github.com/scribusproject/scribus/commit/8dcf8d777bd85a0741c455961f2de382e3ed47ec.patch"; - hash = "sha256-JBHCgvEJnYrUdtLnFSXTfr1FFin4uUNUnddYwfRbn7k="; - }) - (fetchpatch { - name = "fix-build-poppler-25.07.0.patch"; - url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch"; - hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk="; - }) - (fetchpatch { - name = "fix-qt6.10-build.patch"; - url = "https://github.com/scribusproject/scribus/commit/13fc4f874354511e05bf91a48703b57b4c489715.patch"; - hash = "sha256-+pbQ77SaTh04QX55wmS6WeuZf3IGe5nq3pmrhk68tb8="; - }) - (fetchpatch { - name = "fix-build-poppler-25.09.0.patch"; - url = "https://github.com/scribusproject/scribus/commit/f0cfe30019a514bdaf38b78590451e2c5b9b5420.patch"; - hash = "sha256-ONQ3BzGhouO+0zqYUObuJC3NUCFi1PWq6qoRvuSZJws="; - }) - (fetchpatch { - name = "fix-build-poppler-25.10.0.patch"; - url = "https://github.com/scribusproject/scribus/commit/3c1fc34fae1aa26fceb65b6bdf631a7f00b03c3c.patch"; - hash = "sha256-xTwzbT3h4+5hb6Y/sNmzkfDN2LJGOLP1v/WBVsmZXkk="; - }) - ]; + preFixup = '' + qtWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" + ) + ''; meta = { maintainers = with lib.maintainers; [ arthsmn ];