kzones: 0.5 -> 0.6, use finalAttrs
This commit is contained in:
parent
65a8bb46e3
commit
4d88dcf1ff
@ -1,5 +1,5 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, mkDerivation
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, kcoreaddons
|
, kcoreaddons
|
||||||
, kwindowsystem
|
, kwindowsystem
|
||||||
@ -7,17 +7,19 @@
|
|||||||
, systemsettings
|
, systemsettings
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
stdenv.mkDerivation(finalAttrs: {
|
||||||
pname = "kzones";
|
pname = "kzones";
|
||||||
version = "0.5";
|
version = "0.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gerritdevriese";
|
owner = "gerritdevriese";
|
||||||
repo = "kzones";
|
repo = "kzones";
|
||||||
rev = "v${version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-0f7Fv5cvRvqNrKjHpU/tLpjiBPN0ExwTDq1p9sdLd4o=";
|
sha256 = "sha256-OAgzuX05dvotjRWiyPPeUieVJbQoy/opGYu6uVKQM60=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ plasma-framework ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
kcoreaddons
|
kcoreaddons
|
||||||
kwindowsystem
|
kwindowsystem
|
||||||
@ -27,13 +29,16 @@ mkDerivation rec {
|
|||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
|
# we don't have anything to wrap anyway
|
||||||
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
# 1. --global still installs to $HOME/.local/share so we use --packageroot
|
# 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
|
# 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts
|
plasmapkg2 --type kwinscript --install ${finalAttrs.src} --packageroot $out/share/kwin/scripts
|
||||||
install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-kzones.desktop
|
install -Dm644 ${finalAttrs.src}/metadata.desktop $out/share/kservices5/kwin-script-kzones.desktop
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
@ -42,8 +47,7 @@ mkDerivation rec {
|
|||||||
description = "KWin Script for snapping windows into zones";
|
description = "KWin Script for snapping windows into zones";
|
||||||
maintainers = with maintainers; [ matthiasbeyer ];
|
maintainers = with maintainers; [ matthiasbeyer ];
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
inherit (src.meta) homepage;
|
inherit (finalAttrs.src.meta) homepage;
|
||||||
inherit (kwindowsystem.meta) platforms;
|
inherit (kwindowsystem.meta) platforms;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user