mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/kde/plasma/breeze-gtk/default.nix
View file

@ -10,10 +10,5 @@ mkKdeDerivation {
# FIXME(later): upstream # FIXME(later): upstream
patches = [./0001-fix-add-executable-bit.patch]; 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]; extraNativeBuildInputs = [sass python3 python3Packages.pycairo];
} }

3
pkgs/kde/plasma/breeze-plymouth/default.nix
View file

@ -41,9 +41,6 @@ in
postPatch = postPatch =
'' ''
substituteInPlace cmake/FindPlymouth.cmake --subst-var out 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) '' + lib.optionalString (logoFile != null) ''
cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png

9
pkgs/kde/plasma/kpipewire/default.nix
View file

@ -1,6 +1,5 @@
{ {
mkKdeDerivation, mkKdeDerivation,
fetchpatch,
qtquick3d, qtquick3d,
pkg-config, pkg-config,
pipewire, pipewire,
@ -11,14 +10,6 @@
mkKdeDerivation { mkKdeDerivation {
pname = "kpipewire"; 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]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva];
} }