diff options
| author | Claudius "keldu" Holeksa <mail@keldu.de> | 2025-11-05 14:35:52 +0100 |
|---|---|---|
| committer | Claudius "keldu" Holeksa <mail@keldu.de> | 2025-11-05 14:35:52 +0100 |
| commit | 7e041e39094ccd0c06761dc2dc59fa7fcf248445 (patch) | |
| tree | e4813f26089589848438e02d98b7c36cd6a6d6ed | |
| parent | 75fe13f1a95b201360b7fe7bd3a8d034d6edd0e6 (diff) | |
| download | libs-lbm-7e041e39094ccd0c06761dc2dc59fa7fcf248445.tar.gz | |
Reworking general structure
| -rw-r--r-- | default.nix | 4 | ||||
| -rw-r--r-- | examples/cavity_2d_gpu/.nix/derivation.nix | 3 | ||||
| -rw-r--r-- | examples/poiseulle_3d/.nix/derivation.nix | 3 | ||||
| -rw-r--r-- | lib/sycl/.nix/derivation.nix | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/default.nix b/default.nix index a63a5e7..b7f3b99 100644 --- a/default.nix +++ b/default.nix @@ -25,10 +25,10 @@ let in rec { kel-lbm = { core = pkgs.callPackage ./lib/core/.nix/derivation.nix { - inherit forstio stdenv clang-tools; + inherit forstio stdenv clang-tools pname version; }; sycl = pkgs.callPackage ./lib/sycl/.nix/derivation.nix { - inherit forstio stdenv clang-tools kel-lbm adaptive-cpp; + inherit forstio stdenv clang-tools pname version kel-lbm adaptive-cpp; }; }; diff --git a/examples/cavity_2d_gpu/.nix/derivation.nix b/examples/cavity_2d_gpu/.nix/derivation.nix index 0b604f5..0f06d2d 100644 --- a/examples/cavity_2d_gpu/.nix/derivation.nix +++ b/examples/cavity_2d_gpu/.nix/derivation.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { forstio.remote forstio.codec-json adaptive-cpp - kel-lbm + kel-lbm.core +# kel-lbm.sycl ]; preferLocalBuild = true; diff --git a/examples/poiseulle_3d/.nix/derivation.nix b/examples/poiseulle_3d/.nix/derivation.nix index f00b6df..fdf4ad8 100644 --- a/examples/poiseulle_3d/.nix/derivation.nix +++ b/examples/poiseulle_3d/.nix/derivation.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation { forstio.remote forstio.remote-sycl adaptive-cpp - kel-lbm + kel-lbm.core + kel-lbm.sycl ]; preferLocalBuild = true; diff --git a/lib/sycl/.nix/derivation.nix b/lib/sycl/.nix/derivation.nix index bbe98a4..68fbab7 100644 --- a/lib/sycl/.nix/derivation.nix +++ b/lib/sycl/.nix/derivation.nix @@ -2,9 +2,11 @@ , stdenv , scons , clang-tools -, forstio , pname , version +, forstio +, kel-lbm +, adaptive-cpp }: stdenv.mkDerivation { @@ -25,6 +27,8 @@ stdenv.mkDerivation { forstio.codec-json forstio.remote forstio.remote-sycl + kel-lbm.core + adaptive-cpp ]; doCheck = true; |