summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudius "keldu" Holeksa <mail@keldu.de>2024-03-05 15:54:21 +0100
committerClaudius "keldu" Holeksa <mail@keldu.de>2024-03-05 15:54:21 +0100
commit1677940809c679f6505d6689a5f6018e33b840b0 (patch)
treec88ae46c52465413e0eb4016a1ca2e10e9e5c45d
parentf3dde8285baf87a89d2a9b79ac719573c47538ff (diff)
fixing to new stdenv
-rw-r--r--.nix/derivation.nix6
-rw-r--r--c++/examples/cavity_2d.cpp6
-rw-r--r--default.nix10
3 files changed, 12 insertions, 10 deletions
diff --git a/.nix/derivation.nix b/.nix/derivation.nix
index 6ba3b2f..895a2f2 100644
--- a/.nix/derivation.nix
+++ b/.nix/derivation.nix
@@ -1,20 +1,18 @@
{ lib
-, stdenvNoCC
+, stdenv
, scons
-, clang
, clang-tools
, forstio
, kel-unit
}:
-stdenvNoCC.mkDerivation {
+stdenv.mkDerivation {
pname = "kel-lbm";
version = "0.0.0";
src = ./..;
nativeBuildInputs = [
scons
- clang
clang-tools
];
diff --git a/c++/examples/cavity_2d.cpp b/c++/examples/cavity_2d.cpp
index 88e53fe..2899f88 100644
--- a/c++/examples/cavity_2d.cpp
+++ b/c++/examples/cavity_2d.cpp
@@ -32,6 +32,9 @@ using Cell = CellData<
}
+/**
+ * 2 A pull pattern
+ */
template<size_t D, size_t Q>
class collision {
public:
@@ -57,7 +60,6 @@ public:
}
return eq;
-
}
void compute_rho_u(
@@ -178,5 +180,7 @@ int main(){
std::cout<<std::endl;
+
+
return 0;
}
diff --git a/default.nix b/default.nix
index 0ea5cdf..2ed8c2a 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
{ pkgs ? import <nixpkgs> {}
-, clang ? pkgs.clang_15
-, clang-tools ? pkgs.clang-tools_15
+, stdenv ? pkgs.stdenv
+, clang-tools ? pkgs.clang-tools_16
}:
let
@@ -8,7 +8,7 @@ let
url = "git@git.keldu.de:forstio/forstio";
ref = "dev";
}).outPath + "/default.nix"){
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
}).forstio;
@@ -16,13 +16,13 @@ let
url = "git@git.keldu.de:libs/unit";
ref = "dev";
}).outPath + "/default.nix"){
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
});
in pkgs.callPackage ./.nix/derivation.nix {
inherit forstio;
inherit kel-unit;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
}