Merge branch 'main' into feat/gtk4

2 files changed, 61 insertions, 1 deletions

diff --git a/nix/libcava.nix b/nix/libcava.nix
new file mode 100644
index 0000000..866599d
--- /dev/null
+++ b/nix/libcava.nix
@@ -0,0 +1,60 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  autoconf-archive,
+  alsa-lib,
+  fftw,
+  iniparser,
+  libpulseaudio,
+  portaudio,
+  sndio,
+  SDL2,
+  libGL,
+  pipewire,
+  jack2,
+  ncurses,
+  pkgconf,
+  meson,
+  ninja,
+}:
+stdenv.mkDerivation rec {
+  pname = "cava";
+  version = "0.10.3";
+
+  src = fetchFromGitHub {
+    owner = "LukashonakV";
+    repo = "cava";
+    rev = "0.10.3";
+    hash = "sha256-ZDFbI69ECsUTjbhlw2kHRufZbQMu+FQSMmncCJ5pagg=";
+  };
+
+  buildInputs = [
+    alsa-lib
+    libpulseaudio
+    ncurses
+    iniparser
+    sndio
+    SDL2
+    libGL
+    portaudio
+    jack2
+    pipewire
+  ];
+
+  propagatedBuildInputs = [
+    fftw
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    autoconf-archive
+    pkgconf
+    meson
+    ninja
+  ];
+
+  preAutoreconf = ''
+    echo ${version} > version
+  '';
+}
diff --git a/nix/lua.nix b/nix/lua.nix
index 549c6c3..d4221f1 100644
--- a/nix/lua.nix
+++ b/nix/lua.nix
@@ -12,7 +12,7 @@ defaults: {
       ps.lgi
       (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation {
         name = "astal";
-        src = "${astal}/lang/lua";
+        src = "${astal}/lang/lua/astal";
         dontBuild = true;
         installPhase = ''
           mkdir -p $out/share/lua/${ps.lua.luaversion}/astal