diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b9854a306aa..aeced5c4e464 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12292,6 +12292,11 @@ githubId = 401263; keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ]; }; + mac-chaffee = { + name = "Mac Chaffee"; + github = "mac-chaffee"; + githubId = 7581860; + }; macronova = { name = "Sicheng Pan"; email = "trivial@invariantspace.com"; @@ -12300,12 +12305,6 @@ githubId = 60079945; keys = [ { fingerprint = "49D3 FFDA 4D30 DDEE 68EF AE84 EBC4 A200 6737 3921"; } ]; }; - - mac-chaffee = { - name = "Mac Chaffee"; - github = "mac-chaffee"; - githubId = 7581860; - }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index 210b93f87464..8a1302a1de37 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -23,7 +23,7 @@ mkKdeDerivation { fetchSubmodules = true; }; - patches = [./nix-plugin.patch]; + patches = [ ./nix-plugin.patch ]; extraBuildInputs = [ extra-cmake-modules @@ -33,24 +33,23 @@ mkKdeDerivation { mpv ]; - extraCmakeFlags = ["-DUSE_PLASMAPKG=ON"]; + extraCmakeFlags = [ "-DUSE_PLASMAPKG=ON" ]; extraNativeBuildInputs = [ kpackage pkg-config ]; - postInstall = let - py3-ws = python3.withPackages (ps: - with ps; [ - websockets - ]); - in '' - cd ../plugin - PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py - substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} - kpackagetool6 -i ./ -p $out/share/plasma/wallpapers/ - ''; + postInstall = + let + py3-ws = python3.withPackages (ps: with ps; [ websockets ]); + in + '' + cd ../plugin + PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py + substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} + kpackagetool6 -i ./ -p $out/share/plasma/wallpapers/ + ''; meta = with lib; { description = "A KDE wallpaper plugin integrating Wallpaper Engine";