pyrox.dev / nixpkgs
lol
fork atom

Revert "kde/plasma: apply hacks to fix build"

This reverts commit 35f59cc7a5022d33fc23e14ca29ae9684db8ee3e.

K900 516bd5c9 38e554ef

-17
unified split
-5
pkgs/kde/plasma/breeze-gtk/default.nix
··· 10 # FIXME(later): upstream 11 patches = [./0001-fix-add-executable-bit.patch]; 12 13 - # FIXME: hack to fix build, remove for 6.0.2 14 - postPatch = '' 15 - substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" 16 - ''; 17 - 18 extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; 19 }
··· 10 # FIXME(later): upstream 11 patches = [./0001-fix-add-executable-bit.patch]; 12 13 extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; 14 }
-3
pkgs/kde/plasma/breeze-plymouth/default.nix
··· 41 postPatch = 42 '' 43 substituteInPlace cmake/FindPlymouth.cmake --subst-var out 44 - 45 - # FIXME: hack to fix build, remove for 6.0.2 46 - substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" 47 '' 48 + lib.optionalString (logoFile != null) '' 49 cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png
··· 41 postPatch = 42 '' 43 substituteInPlace cmake/FindPlymouth.cmake --subst-var out 44 '' 45 + lib.optionalString (logoFile != null) '' 46 cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png
-9
pkgs/kde/plasma/kpipewire/default.nix
··· 1 { 2 mkKdeDerivation, 3 - fetchpatch, 4 qtquick3d, 5 pkg-config, 6 pipewire, ··· 10 }: 11 mkKdeDerivation { 12 pname = "kpipewire"; 13 - 14 - # FIXME: backport to fix build, remove for 6.0.2 15 - patches = [ 16 - (fetchpatch { 17 - url = "https://invent.kde.org/plasma/kpipewire/-/commit/df052bfa3c66d24109f40f18266ee057d1838b9b.patch"; 18 - hash = "sha256-69ftUUz5cvG/CmCw3hHFeU8XKhZPJjnx1raJCCay38g="; 19 - }) 20 - ]; 21 22 extraNativeBuildInputs = [pkg-config]; 23 extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva];
··· 1 { 2 mkKdeDerivation, 3 qtquick3d, 4 pkg-config, 5 pipewire, ··· 9 }: 10 mkKdeDerivation { 11 pname = "kpipewire"; 12 13 extraNativeBuildInputs = [pkg-config]; 14 extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva];