From 35f59cc7a5022d33fc23e14ca29ae9684db8ee3e Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 10:43:17 +0300 Subject: [PATCH] kde/plasma: apply hacks to fix build --- pkgs/kde/plasma/breeze-gtk/default.nix | 5 +++++ pkgs/kde/plasma/breeze-plymouth/default.nix | 3 +++ pkgs/kde/plasma/kpipewire/default.nix | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index fc0bc4759d48..621ae4f88aae 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -10,5 +10,10 @@ mkKdeDerivation { # FIXME(later): upstream patches = [./0001-fix-add-executable-bit.patch]; + # FIXME: hack to fix build, remove for 6.0.2 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" + ''; + extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index 7551eca94e3a..b69ff3601a56 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -41,6 +41,9 @@ in postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out + + # FIXME: hack to fix build, remove for 6.0.2 + substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" '' + lib.optionalString (logoFile != null) '' cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d51..18e595f39e16 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, qtquick3d, pkg-config, pipewire, @@ -10,6 +11,14 @@ mkKdeDerivation { pname = "kpipewire"; + # FIXME: backport to fix build, remove for 6.0.2 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/plasma/kpipewire/-/commit/df052bfa3c66d24109f40f18266ee057d1838b9b.patch"; + hash = "sha256-69ftUUz5cvG/CmCw3hHFeU8XKhZPJjnx1raJCCay38g="; + }) + ]; + extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; }