From 271f8c4e5046b22cadbf01a8f931dedc5be87272 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 12 Feb 2026 11:17:08 +0100
Subject: [PATCH] awesome: move env variable(s) into env for structuredAttrs

---
 .../window-managers/awesome/default.nix           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 8c7ef0442848..4d9db85dbc2f 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -114,8 +114,6 @@ stdenv.mkDerivation rec {
     "doc"
   ];
 
-  FONTCONFIG_FILE = toString fontsConf;
-
   propagatedUserEnvPkgs = [ hicolor-icon-theme ];
   buildInputs = [
     cairo
@@ -150,11 +148,14 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional lua.pkgs.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so";
 
-  GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
-  # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags
-  # below for how awesome finds the libraries it needs at runtime.
-  LUA_CPATH = "${luaEnv}/lib/lua/${lua.luaversion}/?.so";
-  LUA_PATH = "${luaEnv}/share/lua/${lua.luaversion}/?.lua;;";
+  env = {
+    FONTCONFIG_FILE = toString fontsConf;
+    GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
+    # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags
+    # below for how awesome finds the libraries it needs at runtime.
+    LUA_CPATH = "${luaEnv}/lib/lua/${lua.luaversion}/?.so";
+    LUA_PATH = "${luaEnv}/share/lua/${lua.luaversion}/?.lua;;";
+  };
 
   postInstall = ''
     # Don't use wrapProgram or the wrapper will duplicate the --search