summaryrefslogtreecommitdiff
path: root/modules/window
diff options
context:
space:
mode:
authorClaudius "keldu" Holeksa <mail@keldu.de>2024-07-18 00:30:09 +0200
committerClaudius "keldu" Holeksa <mail@keldu.de>2024-07-18 00:30:09 +0200
commitf81526d2b8f4b618eab183d1703e045989104f3f (patch)
tree35f60c3fa0c2d0f01af0b383a44b96518986ad8f /modules/window
parent9c2558e419f20def55e09b9ad016775860ce7fb5 (diff)
More window fixes
Diffstat (limited to 'modules/window')
-rw-r--r--modules/window/.nix/derivation.nix2
-rw-r--r--modules/window/SConstruct9
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/window/.nix/derivation.nix b/modules/window/.nix/derivation.nix
index 2b15505..67c62b4 100644
--- a/modules/window/.nix/derivation.nix
+++ b/modules/window/.nix/derivation.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
xorg.libxcb
];
- doCheck = true;
+ doCheck = false;
checkPhase = ''
scons test
./bin/tests
diff --git a/modules/window/SConstruct b/modules/window/SConstruct
index 05fc016..cc66f21 100644
--- a/modules/window/SConstruct
+++ b/modules/window/SConstruct
@@ -46,7 +46,14 @@ env_vars.Add('prefix',
env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
CPPDEFINES=['SAW_UNIX', 'SAW_UNIX_XCB'],
CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
- LIBS=['forstio-core', 'forstio-io', 'forstio-async', 'forstio-codec'])
+ LIBS=[
+ 'forstio-core'
+ ,'forstio-io'
+ ,'forstio-async'
+ ,'forstio-codec'
+ ]
+);
+
env.__class__.add_source_files = add_kel_source_files
env.Tool('compilation_db');
env.cdb = env.CompilationDatabase('compile_commands.json');