Unverified Commit 271f8c4e authored by Stefan Frijters's avatar Stefan Frijters
Browse files

awesome: move env variable(s) into env for structuredAttrs

parent 597404d6

pkgs/applications/window-managers/awesome/default.nix

+8 −7
Original line number Diff line number Diff line
@@ -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";



  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