diff --git a/packages/default.nix b/packages/default.nix index 82c8e1eb..39086cb3 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -144,7 +144,7 @@ inputs: rec buildProxy = inputs.pkgs.lib.mkBuildproxy ./pybinding/proxy.nix; }; brokenaxes = inputs.pkgs.python3Packages.callPackage ./brokenaxes.nix { src = inputs.topInputs.brokenaxes; }; - missgram = inputs.pkgs.callPackage ./missgram { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; + missgram = inputs.pkgs.callPackage ./missgram { inherit biu sqlgen; stdenv = inputs.pkgs.clang18Stdenv; }; sqlgen = inputs.pkgs.callPackage ./sqlgen.nix { src = inputs.topInputs.sqlgen; inherit reflectcpp; }; reflectcpp = inputs.pkgs.callPackage ./reflectcpp.nix { src = inputs.topInputs.reflectcpp; }; diff --git a/packages/missgram/CMakeLists.txt b/packages/missgram/CMakeLists.txt index c0f7f906..0e617f6e 100644 --- a/packages/missgram/CMakeLists.txt +++ b/packages/missgram/CMakeLists.txt @@ -11,9 +11,11 @@ endif() find_package(biu REQUIRED) find_package(httplib REQUIRED) +find_package(sqlgen REQUIRED) -add_executable(missgram src/main.cpp) -target_link_libraries(missgram PRIVATE biu::biu httplib::httplib) +add_executable(missgram src/main.cpp src/sql.cpp) +target_include_directories(missgram PRIVATE $) +target_link_libraries(missgram PRIVATE biu::biu httplib::httplib sqlgen::sqlgen) target_compile_features(missgram PRIVATE cxx_std_23) if(DEFINED MISSGRAM_CONFIG_FILE) target_compile_definitions(missgram PRIVATE MISSGRAM_CONFIG_FILE="${MISSGRAM_CONFIG_FILE}") diff --git a/packages/missgram/default.nix b/packages/missgram/default.nix index f386c08a..4bc098da 100644 --- a/packages/missgram/default.nix +++ b/packages/missgram/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, cmake, pkg-config, biu, configFile ? null, httplib }: stdenv.mkDerivation +{ lib, stdenv, cmake, pkg-config, biu, configFile ? null, httplib, sqlgen }: stdenv.mkDerivation { name = "missgram"; src = ./.; - buildInputs = [ biu httplib ]; + buildInputs = [ biu httplib sqlgen ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = lib.optional (configFile != null) [ "-DMISSGRAM_CONFIG_FILE=${configFile}" ]; } diff --git a/packages/missgram/include/missgram.hpp b/packages/missgram/include/missgram.hpp new file mode 100644 index 00000000..e69de29b diff --git a/packages/missgram/src/sql.cpp b/packages/missgram/src/sql.cpp new file mode 100644 index 00000000..decc21d2 --- /dev/null +++ b/packages/missgram/src/sql.cpp @@ -0,0 +1,2 @@ +# include +# include diff --git a/packages/sqlgen.nix b/packages/sqlgen.nix index 574b0ac4..64625400 100644 --- a/packages/sqlgen.nix +++ b/packages/sqlgen.nix @@ -3,6 +3,6 @@ name = "sqlgen"; inherit src; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ postgresql reflectcpp ]; + propagatedBuildInputs = [ postgresql reflectcpp ]; cmakeFlags = [ "-DSQLGEN_USE_VCPKG=OFF" "-DSQLGEN_SQLITE3=OFF" "-DBUILD_SHARED_LIBS=ON" ]; }