diff options
| author | Stefano Mazzucco <stefano@curso.re> | 2019-04-27 15:49:43 +0100 |
|---|---|---|
| committer | Stefano Mazzucco <stefano@curso.re> | 2019-04-27 15:49:43 +0100 |
| commit | c973e15fb6f54f5d1bc783dddfeddd59ba664226 (patch) | |
| tree | 61c9ce99a30a25fac62938a54c1e2755876df14e /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 672c3c1d2a8ed40c1ef6bd29823af6a8c915584c (diff) | |
awesome: refactor LUA_PATH env var and don't expose it at runtime
This commit partly reinstates changes from 5465d6f that had been somehow
reverted in 17d3eb2. Also, a comment has been added in the hope that future
changes won't do the same.
Additionally, refactor the LUA_PATH env var to ensure that the internal lgi lua
files can't be required explicitly and to avoid possible name clashes (this
fixes issue #60232).
Finally, rather than using prepending `?.lua` append `;;` to LUA_PATH. Quoting
@psychon:
> This is interpreted by Lua as "add the default search path here" (which does
> indeed contain ?.lua, but also contains more).
Testing done:
- Build with `nix-build -I /path/to/repo -A awesome`
- Start an X session with xterm only
- Start xephyr, e.g. `Xephyr :1 -name xephyr -screen 512x384 -ac -br -noreset &`
- Run awesome like `DISPLAY=:1.0 ./result/bin/awesome`. Additionally, add
`--search` options to expose lua modules that have a name clash with lgi's
internal ones (see #60232 for more details) and `require` them in `rc.lua` to
prove that they are loaded correctly
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions
