commit 5465d6f7ded73a815b4ed3953f6d00d0aa563ac3 · pyrox.dev/nixpkgs

+6 -5

nixos/modules/services/x11/window-managers/awesome.nix

···

       6
       6
        
       

     

       7
       7
        
         cfg = config.services.xserver.windowManager.awesome;

     

       8
       8
        
         awesome = cfg.package;

     

       9
       9
       -
         inherit (pkgs.luaPackages) getLuaPath getLuaCPath;

     

       9
       9
       +
         getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}";

     

       10
       10
       +
         makeSearchPath = lib.concatMapStrings (path:

     

       11
       11
       +
           " --search " + (getLuaPath path "share") +

     

       12
       12
       +
           " --search " + (getLuaPath path "lib")

     

       13
       13
       +
         );

     

       10
       14
        
       in

     

       11
       15
        
       

     

       12
       16
        
       {

     
···

       46
       50
        
             { name = "awesome";

     

       47
       51
        
               start =

     

       48
       52
        
                 ''

     

       49
       49
       -
                   export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}"

     

       50
       50
       -
                   export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}"

     

       51
       51
       -
       

     

       52
       52
       -
                   ${awesome}/bin/awesome &

     

       53
       53
       +
                   ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} &

     

       53
       54
        
                   waitPID=$!

     

       54
       55
        
                 '';

     

       55
       56
        
             };

+2 -2

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

···

       49
       49
        
         postInstall = ''

     

       50
       50
        
           wrapProgram $out/bin/awesome \

     

       51
       51
        
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       52
       52
       -
             --prefix LUA_CPATH ";" '${lgi}/lib/lua/${lua.luaversion}/?.so' \

     

       53
       53
       -
             --prefix LUA_PATH ";" '${lgi}/share/lua/${lua.luaversion}/?.lua' \

     

       52
       52
       +
             --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \

     

       53
       53
       +
             --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \

     

       54
       54
        
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       55
       55
        
             --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \

     

       56
       56
        
             --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"