diff options
author | K900 <me@0upti.me> | 2023-08-09 17:45:03 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-09 17:45:03 +0300 |
commit | 6338d16648addb7d15897e4fafe86d6d0cba42c5 (patch) | |
tree | f6efdcb04b29d38db6700e9891fb67e7f2dd7a3c | |
parent | 11e4ec4615408fa1fc20e5872b83f16e8f3a0050 (diff) | |
parent | 4d88dcf1ff846e9554fdc98d7859b265ce1e67a7 (diff) |
Merge pull request #247685 from K900/kzones-0.6
kzones: 0.5 -> 0.6, use finalAttrs
-rw-r--r-- | pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index 95050843d0730..f35ce8f1d0bd2 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , kcoreaddons , kwindowsystem @@ -7,17 +7,19 @@ , systemsettings }: -mkDerivation rec { +stdenv.mkDerivation(finalAttrs: { pname = "kzones"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; - rev = "v${version}"; - sha256 = "sha256-0f7Fv5cvRvqNrKjHpU/tLpjiBPN0ExwTDq1p9sdLd4o="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-OAgzuX05dvotjRWiyPPeUieVJbQoy/opGYu6uVKQM60="; }; + nativeBuildInputs = [ plasma-framework ]; + buildInputs = [ kcoreaddons kwindowsystem @@ -27,13 +29,16 @@ mkDerivation rec { dontBuild = true; + # we don't have anything to wrap anyway + dontWrapQtApps = true; + # 1. --global still installs to $HOME/.local/share so we use --packageroot # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually installPhase = '' runHook preInstall - plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts - install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-kzones.desktop + plasmapkg2 --type kwinscript --install ${finalAttrs.src} --packageroot $out/share/kwin/scripts + install -Dm644 ${finalAttrs.src}/metadata.desktop $out/share/kservices5/kwin-script-kzones.desktop runHook postInstall ''; @@ -42,8 +47,7 @@ mkDerivation rec { description = "KWin Script for snapping windows into zones"; maintainers = with maintainers; [ matthiasbeyer ]; license = licenses.gpl3Plus; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; inherit (kwindowsystem.meta) platforms; }; -} - +}) |