diff options
author | Aleksana <me@aleksana.moe> | 2024-04-21 18:11:58 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-21 18:11:58 +0800 |
commit | 00c77a45b16775c655dd8361113bb9b3a5473920 (patch) | |
tree | 000ccf8a0781b332078bbfa52fbcde5e1180d5f7 /pkgs/by-name | |
parent | 2ce4232bd84237b731c73bf37bbdb2c3ed98c34f (diff) | |
parent | 2d9237e70cce8f7602ee8d20e9ec4a35194e466b (diff) |
Merge pull request #305672 from SergioRibera/swayosd
swayosd: unstable-2023-09-26 -> 0-unstable-2024-04-15
Diffstat (limited to 'pkgs/by-name')
-rw-r--r-- | pkgs/by-name/sw/swayosd/package.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix index d3bd68ea1e4e9..d3238053c0196 100644 --- a/pkgs/by-name/sw/swayosd/package.nix +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , wrapGAppsHook +, brightnessctl , cargo , coreutils , gtk-layer-shell @@ -12,25 +13,26 @@ , meson , ninja , rustc +, sassc , stdenv , udev }: stdenv.mkDerivation rec { pname = "swayosd"; - version = "unstable-2023-09-26"; + version = "0-unstable-2024-04-15"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayOSD"; - rev = "1c7d2f5b3ee262f25bdd3c899eadf17efb656d26"; - hash = "sha256-Y22O6Ktya/WIhidnoyxnZu5YvXWNmSS6vecDU8zDD34="; + rev = "11271760052c4a4a4057f2d287944d74e8fbdb58"; + hash = "sha256-qOxnl2J+Ivx/TIqodv3a8nP0JQsYoKIrhqnbD9IxU8g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tqbMlygX+n14oR1t+0ngjiSG2mHUk/NbiWHk4yEAb2o="; + hash = "sha256-exbVanUvGp0ub4WE3VcsN8hkcK0Ipf0tNfd92UecICg="; }; nativeBuildInputs = [ @@ -49,12 +51,19 @@ stdenv.mkDerivation rec { libinput libpulseaudio udev + sassc ]; patches = [ ./swayosd_systemd_paths.patch ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ brightnessctl ]} + ) + ''; + postPatch = '' substituteInPlace data/udev/99-swayosd.rules \ --replace /bin/chgrp ${coreutils}/bin/chgrp \ @@ -65,7 +74,7 @@ stdenv.mkDerivation rec { description = "A GTK based on screen display for keyboard shortcuts"; homepage = "https://github.com/ErikReider/SwayOSD"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aleksana barab-i ]; + maintainers = with maintainers; [ aleksana barab-i sergioribera ]; platforms = platforms.linux; }; } |