update commits (nvidia still brokie)HEADmain

1 files changed, 32 insertions, 31 deletions

diff --git a/pkgs/astal/builder.nix b/pkgs/astal/builder.nix
index db102bd..ffb38ce 100644
--- a/pkgs/astal/builder.nix
+++ b/pkgs/astal/builder.nix
@@ -1,43 +1,44 @@
 {
-  pkgs,
+  stdenvNoCC,
   astal,
+  gobject-introspection,
+  lib,
+  lua,
   name,
   src,
-  extraLuaPackages ? (_: []),
+  wrapGAppsHook3,
   extraPackages ? [],
 }: let
-  lua = pkgs.lua.withPackages (ps:
-    (extraLuaPackages ps)
-    ++ [
-      ps.lgi
-      (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation {
-        name = "astal";
-        src = "${astal}/lang/lua/astal";
-        dontBuild = true;
-        installPhase = ''
-          mkdir -p $out/share/lua/${ps.lua.luaversion}/astal
-          cp -r * $out/share/lua/${ps.lua.luaversion}/astal
-        '';
-      }))
-      (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation {
-        inherit src name;
-        dontBuild = true;
-        installPhase = ''
-          mkdir -p $out/share/lua/${ps.lua.luaversion}
-          cp -r * $out/share/lua/${ps.lua.luaversion}
-        '';
-      }))
-    ]);
+  lua_ = lua.withPackages (ps: [
+    ps.lgi
+    (ps.luaPackages.toLuaModule (stdenvNoCC.mkDerivation {
+      name = "astal";
+      src = "${astal}/lang/lua/astal";
+      dontBuild = true;
+      installPhase = ''
+        mkdir -p $out/share/lua/${ps.lua.luaversion}/astal
+        cp -r * $out/share/lua/${ps.lua.luaversion}/astal
+      '';
+    }))
+    (ps.luaPackages.toLuaModule (stdenvNoCC.mkDerivation {
+      inherit src name;
+      dontBuild = true;
+      installPhase = ''
+        mkdir -p $out/share/lua/${ps.lua.luaversion}
+        cp -r * $out/share/lua/${ps.lua.luaversion}
+      '';
+    }))
+  ]);
 
   script = ''
-    #!${lua}/bin/lua
+    #!${lua_}/bin/lua
     require "init"
   '';
 in
-  pkgs.stdenvNoCC.mkDerivation {
+  stdenvNoCC.mkDerivation {
     inherit src name;
 
-    nativeBuildInputs = with pkgs; [
+    nativeBuildInputs = [
       wrapGAppsHook3
       gobject-introspection
     ];
@@ -45,9 +46,9 @@ in
     buildInputs =
       extraPackages
       ++ [
-        lua
-        astal.packages.${pkgs.stdenv.hostPlatform.system}.io
-        astal.packages.${pkgs.stdenv.hostPlatform.system}.astal3
+        lua_
+        astal.io
+        astal.astal3
       ];
 
     installPhase = ''
@@ -63,7 +64,7 @@ in
 
     preFixup = ''
       gappsWrapperArgs+=(
-        --prefix PATH : "${pkgs.lib.makeBinPath extraPackages}"
+        --prefix PATH : "${lib.makeBinPath extraPackages}"
       )
     '';
   }