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

This reverts commit 35f59cc7a5.
This commit is contained in:
K900 2024-03-06 13:03:10 +03:00
parent 38e554ef2c
commit 516bd5c927
3 changed files with 0 additions and 17 deletions

View file

@ -10,10 +10,5 @@ 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];
}

View file

@ -41,9 +41,6 @@ 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

View file

@ -1,6 +1,5 @@
{
mkKdeDerivation,
fetchpatch,
qtquick3d,
pkg-config,
pipewire,
@ -11,14 +10,6 @@
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];
}