touchups

fix docs derivation
format meson.build

3 files changed, 12 insertions, 9 deletions

diff --git a/docs/default.nix b/docs/default.nix
index d61e215..1370fc6 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -153,7 +153,9 @@ in
         description = "DBus proxy for bluez";
         version = ../lib/bluetooth/version;
       }}
-      ${genLib "cava" "Cava" {
+      ${genLib {
+        flakepkg = "cava";
+        gir = "Cava";
         description = "Audio visualization library using cava";
         version = ../lib/cava/version;
         authors = "kotontrion";
diff --git a/flake.nix b/flake.nix
index 46d81a8..2f7189b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,12 +62,11 @@
       river = mkPkg "astal-river" ./lib/river [json-glib];
       tray = mkPkg "astal-tray" ./lib/tray [gtk3 gdk-pixbuf libdbusmenu-gtk3 json-glib];
       wireplumber = mkPkg "astal-wireplumber" ./lib/wireplumber [wireplumber];
-      # polkit = mkPkg "astal-polkit" ./lib/polkit [polkit];
 
       gjs = pkgs.stdenvNoCC.mkDerivation {
         src = ./lang/gjs;
         name = "astal-gjs";
-        buildInputs = [
+        nativeBuildInputs = [
           meson
           ninja
           pkg-config
diff --git a/lib/cava/meson.build b/lib/cava/meson.build
index f7fba2d..874eaf7 100644
--- a/lib/cava/meson.build
+++ b/lib/cava/meson.build
@@ -14,21 +14,23 @@ pkg_config = import('pkgconfig')
 gnome = import('gnome')
 
 srcs = files(
+  'astal-cava.h',
   'cava.c',
-  'astal-cava.h'
 )
 
 install_headers('astal-cava.h')
 
-cava = dependency('cava',
-                  version : '>=0.10.3',
-                  required: true,
-                  fallback : ['cava', 'cava_dep'])
+cava = dependency(
+  'cava',
+  version: '>=0.10.3',
+  required: true,
+  fallback: ['cava', 'cava_dep'],
+)
 
 deps = [
   dependency('gobject-2.0'),
   dependency('gio-2.0'),
-  cava
+  cava,
 ]
 
 astal_cava_lib = library(