From f81526d2b8f4b618eab183d1703e045989104f3f Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 18 Jul 2024 00:30:09 +0200 Subject: More window fixes --- modules/window/.nix/derivation.nix | 2 +- modules/window/SConstruct | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'modules/window') 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'); -- cgit v1.2.3