From e58677b0c38f73686d286be9c0b640eae00e9b07 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 8 Nov 2024 07:02:17 +0000 Subject: [PATCH] syshud: fix changes due to upstream config parsing changes --- hosts/common/programs/syshud.nix | 6 +++--- pkgs/by-name/syshud/package.nix | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hosts/common/programs/syshud.nix b/hosts/common/programs/syshud.nix index 516b6767d..d72d47fcf 100644 --- a/hosts/common/programs/syshud.nix +++ b/hosts/common/programs/syshud.nix @@ -16,13 +16,13 @@ # width/height/icon_size are in pixels width=256 height=39 - icon_size=32 - percentage=false + icon-size=32 + show-percentage=false # margin=0 will position below the sway bar, but on top of the window title margins=22 22 22 22 # timeout: notifier will be dismissed after N seconds (integer only) timeout=1 - transition=0 + transition-time=0 backlight= monitors=audio_in,audio_out ''; diff --git a/pkgs/by-name/syshud/package.nix b/pkgs/by-name/syshud/package.nix index d9cccc499..38aad6a34 100644 --- a/pkgs/by-name/syshud/package.nix +++ b/pkgs/by-name/syshud/package.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Makefile \ - --replace-fail 'pkg-config' ''${PKG_CONFIG} + --replace-fail pkg-config ''${PKG_CONFIG} + substituteInPlace src/main.cpp \ + --replace-fail /usr/share/sys64/hud/config.conf $out/share/sys64/hud/config.conf + substituteInPlace src/window.cpp \ + --replace-fail /usr/share/sys64/hud/style.css $out/share/sys64/hud/style.css ''; nativeBuildInputs = [