cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #305672 from SergioRibera/swayosd

Browse source 
swayosd: unstable-2023-09-26 -> 0-unstable-2024-04-15
This commit is contained in:
Aleksana 2024-04-21 18:11:58 +08:00 committed by GitHub
commit 00c77a45b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View file

@ -18163,6 +18163,11 @@
githubId = 863807; githubId = 863807;
name = "Serge Guelton"; name = "Serge Guelton";
}; };
sergioribera = {
github = "SergioRibera";
githubId = 56278796;
name = "Sergio Ribera";
};
sersorrel = { sersorrel = {
email = "ash@sorrel.sh"; email = "ash@sorrel.sh";
github = "sersorrel"; github = "sersorrel";

19
pkgs/by-name/sw/swayosd/package.nix
View file

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook
, brightnessctl
, cargo , cargo
, coreutils , coreutils
, gtk-layer-shell , gtk-layer-shell
@ -12,25 +13,26 @@
, meson , meson
, ninja , ninja
, rustc , rustc
, sassc
, stdenv , stdenv
, udev , udev
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "swayosd"; pname = "swayosd";
version = "unstable-2023-09-26"; version = "0-unstable-2024-04-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ErikReider"; owner = "ErikReider";
repo = "SwayOSD"; repo = "SwayOSD";
rev = "1c7d2f5b3ee262f25bdd3c899eadf17efb656d26"; rev = "11271760052c4a4a4057f2d287944d74e8fbdb58";
hash = "sha256-Y22O6Ktya/WIhidnoyxnZu5YvXWNmSS6vecDU8zDD34="; hash = "sha256-qOxnl2J+Ivx/TIqodv3a8nP0JQsYoKIrhqnbD9IxU8g=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-tqbMlygX+n14oR1t+0ngjiSG2mHUk/NbiWHk4yEAb2o="; hash = "sha256-exbVanUvGp0ub4WE3VcsN8hkcK0Ipf0tNfd92UecICg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -49,12 +51,19 @@ stdenv.mkDerivation rec {
libinput libinput
libpulseaudio libpulseaudio
udev udev
sassc
]; ];
patches = [ patches = [
./swayosd_systemd_paths.patch ./swayosd_systemd_paths.patch
]; ];
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ brightnessctl ]}
)
'';
postPatch = '' postPatch = ''
substituteInPlace data/udev/99-swayosd.rules \ substituteInPlace data/udev/99-swayosd.rules \
--replace /bin/chgrp ${coreutils}/bin/chgrp \ --replace /bin/chgrp ${coreutils}/bin/chgrp \
@ -65,7 +74,7 @@ stdenv.mkDerivation rec {
description = "A GTK based on screen display for keyboard shortcuts"; description = "A GTK based on screen display for keyboard shortcuts";
homepage = "https://github.com/ErikReider/SwayOSD"; homepage = "https://github.com/ErikReider/SwayOSD";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ aleksana barab-i ]; maintainers = with maintainers; [ aleksana barab-i sergioribera ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }