From 26a86accab5569f6df057c18d583444ab435af62 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 1 Aug 2023 19:02:39 -0400 Subject: [PATCH] build: update swayosd to add custom css --- nixos/overlays/patches/swayosd.patch | 20 ++++++++++++++++++++ nixos/overlays/swayosd.nix | 10 ++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 nixos/overlays/patches/swayosd.patch diff --git a/nixos/overlays/patches/swayosd.patch b/nixos/overlays/patches/swayosd.patch new file mode 100644 index 00000000..f7da068d --- /dev/null +++ b/nixos/overlays/patches/swayosd.patch @@ -0,0 +1,20 @@ +diff --git a/data/meson.build b/data/meson.build +index 1ceaa11..68decdf 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -42,11 +42,7 @@ configure_file( + + # Systemd service unit + systemd = dependency('systemd', required: false) +-if systemd.found() +- systemd_service_install_dir = systemd.get_variable(pkgconfig :'systemdsystemunitdir') +-else +- systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') +-endif ++systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') + + configure_file( + configuration: conf_data, +-- +2.41.0 + diff --git a/nixos/overlays/swayosd.nix b/nixos/overlays/swayosd.nix index 226955bd..d9016388 100644 --- a/nixos/overlays/swayosd.nix +++ b/nixos/overlays/swayosd.nix @@ -4,8 +4,8 @@ final: prev: { src = prev.fetchFromGitHub { owner = "ErikReider"; repo = "SwayOSD"; - rev = "b14c83889c7860c174276d05dec6554169a681d9"; - hash = "sha256-MJuTwEI599Y7q+0u0DMxRYaXsZfpksc2csgnK9Ghp/E="; + rev = "1add33d9ca7d9fa9be3cea39fd300e34ba3417c5"; + hash = "sha256-+shokerDcB12RjWhJVCtM38HUOFxW3CNTRxsWbUnVTs="; }; cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const { @@ -17,8 +17,10 @@ final: prev: { buildInputs = (oldAttrs.buildInputs or [ ]) ++ [ prev.systemd - prev.libevdev - prev.libinput + ]; + + patches = [ + ./patches/swayosd.patch ]; }); }