Merge pull request #268619 from tweag/lib-descriptions
[NixPkgs.git] / pkgs / development / tools / toluapp / environ-and-linux-is-kinda-posix.patch
blob6743b25cb8ab89b41bfd2db1dcecc10d4dde6414
1 As it turns out, scons doesn't inherit environment variables by
2 default. Debugging this was very pleasant. -- oxij
4 diff --git a/SConstruct b/SConstruct
5 index 5c1e774..66aa4c8 100644
6 --- a/SConstruct
7 +++ b/SConstruct
8 @@ -5,13 +5,11 @@ tools = ['default']
9 if os.name == 'nt':
10 tools = ['mingw']
12 -env = Environment(tools = tools)
13 +env = Environment(tools = tools, ENV = os.environ)
15 options_file = None
16 -if sys.platform == 'linux2':
17 - options_file = "linux"
19 -elif 'msvc' in env['TOOLS']:
20 +if 'msvc' in env['TOOLS']:
21 options_file = "msvc"
22 else:
23 options_file = "posix"
24 diff --git a/config_posix.py b/config_posix.py
25 index 2bb696c..eb4eb9b 100644
26 --- a/config_posix.py
27 +++ b/config_posix.py
28 @@ -16,7 +16,7 @@ CCFLAGS = ['-O2', '-ansi', '-Wall']
29 prefix = '/usr/local'
31 # libraries
32 -LIBS = ['lua', 'lualib', 'm']
33 +LIBS = ['lua', 'liblua', 'm']