From 24695fc4d3dce86db5d0688d35c06d23a1449296 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Thu, 23 Oct 2025 16:56:50 +0800 Subject: [PATCH] cantata: fix build with qt 6.10 --- pkgs/by-name/ca/cantata/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix index 52305fa26472..35482d168b9d 100644 --- a/pkgs/by-name/ca/cantata/package.nix +++ b/pkgs/by-name/ca/cantata/package.nix @@ -6,6 +6,7 @@ pkg-config, qt6, perl, + fetchpatch2, # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -176,6 +177,18 @@ stdenv.mkDerivation (finalAttrs: { # patchShebangs the playlists scripts, making that unnecessary (perl will # always be available because it's a dependency) ./dont-check-for-perl-in-PATH.diff + + # remove following patches in next release + (fetchpatch2 { + name = "fix-build-with-qt-610-qfile-open.patch"; + url = "https://github.com/nullobsi/cantata/pull/89.patch"; + hash = "sha256-c7hdecX2oo9jTlLc6zd7LVjgZj4w89zN+eEw7ol/hmI="; + }) + (fetchpatch2 { + name = "fix-build-with-qt-610-invalidateFilter-deprecated.patch"; + url = "https://github.com/nullobsi/cantata/pull/90.patch"; + hash = "sha256-dMxbC/p5mD/TQZEXORbvNON7Zzbvq0khaIR89lU5cO4="; + }) ]; postPatch = ''