summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudius 'keldu' Holeksa <mail@keldu.de>2024-07-15 16:43:18 +0200
committerClaudius 'keldu' Holeksa <mail@keldu.de>2024-07-15 16:43:18 +0200
commitc147ec6aae28d80ff2397cf6acf4ea9c91ee3e4d (patch)
tree018aa3111eb5494112ccb1d4cfd610d2c016a1b2
parent6b68a4f7ddac183f460b668bee7a385daada0ce5 (diff)
Compiles project after move
-rw-r--r--default.nix10
-rw-r--r--modules/remote/.nix/derivation.nix2
-rw-r--r--modules/remote/c++/remote.hpp4
-rw-r--r--modules/remote/c++/remote_loopback.hpp3
4 files changed, 16 insertions, 3 deletions
diff --git a/default.nix b/default.nix
index f5e33ee..20b00fc 100644
--- a/default.nix
+++ b/default.nix
@@ -78,6 +78,15 @@ in rec {
inherit stdenv;
inherit clang-tools;
};
+
+ remote = pkgs.callPackage modules/remote/.nix/derivation.nix {
+ inherit version;
+ inherit forstio;
+ inherit stdenv;
+ inherit clang-tools;
+
+ build_examples = "false";
+ };
remote-sycl = pkgs.callPackage modules/remote-sycl/.nix/derivation.nix {
inherit version;
@@ -121,6 +130,7 @@ in rec {
unstable = pkgs.symlinkJoin {
name = "forstio-unstable-${version}";
paths = [
+ forstio.remote
forstio.remote-sycl
forstio.io_codec
forstio.thread
diff --git a/modules/remote/.nix/derivation.nix b/modules/remote/.nix/derivation.nix
index 8f6dd74..85ea4b7 100644
--- a/modules/remote/.nix/derivation.nix
+++ b/modules/remote/.nix/derivation.nix
@@ -4,6 +4,8 @@
, clang-tools
, version
, forstio
+
+, build_examples ? "false"
}:
let
diff --git a/modules/remote/c++/remote.hpp b/modules/remote/c++/remote.hpp
index 5803154..fd6f4e6 100644
--- a/modules/remote/c++/remote.hpp
+++ b/modules/remote/c++/remote.hpp
@@ -3,8 +3,8 @@
#include <forstio/id.hpp>
#include <forstio/async/async.hpp>
-#include "data.hpp"
-#include "interface.hpp"
+#include <forstio/codec/data.hpp>
+#include <forstio/codec/interface.hpp>
#include <variant>
diff --git a/modules/remote/c++/remote_loopback.hpp b/modules/remote/c++/remote_loopback.hpp
index 2949243..76aab69 100644
--- a/modules/remote/c++/remote_loopback.hpp
+++ b/modules/remote/c++/remote_loopback.hpp
@@ -2,7 +2,8 @@
#include <variant>
-#include "interface.hpp"
+#include <forstio/codec/interface.hpp>
+
#include "remote.hpp"
#include "transfer_loopback.hpp"