From f03b3612c269eb65161d8d4355f85c4c53fac0de Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 13 Jan 2026 18:07:34 +0100
Subject: Nix wrangling with flakes

---
 default.nix                                | 2 +-
 examples/cavity_2d_gpu/.nix/derivation.nix | 6 ++----
 flake.nix                                  | 7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index 168cd08..f2f1f07 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {}
+{ pkgs ? (import <nixpkgs> {})
 , llvmPackages ? pkgs.llvmPackages_19
 , stdenv ? llvmPackages.stdenv
 , clang-tools ? llvmPackages.clang-tools
diff --git a/examples/cavity_2d_gpu/.nix/derivation.nix b/examples/cavity_2d_gpu/.nix/derivation.nix
index 2d76484..8724d96 100644
--- a/examples/cavity_2d_gpu/.nix/derivation.nix
+++ b/examples/cavity_2d_gpu/.nix/derivation.nix
@@ -7,7 +7,7 @@
 , pname
 , version
 , adaptive-cpp
-, kel-lbm
+, kel
 }:
 
 stdenv.mkDerivation {
@@ -29,11 +29,9 @@ stdenv.mkDerivation {
 		forstio.remote
 		forstio.codec-json
 		adaptive-cpp
-		kel-lbm.core
+		kel.lbm.core
 #		kel-lbm.sycl
 	];
 
 	preferLocalBuild = true;
-
-	outputs = [ "out" "dev" ];
 }
diff --git a/flake.nix b/flake.nix
index 95430cd..f6bbb28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,10 +11,9 @@
 		pkgs = import nixpkgs {
 			inherit system;
 		};
-		packageSet = pkgs.callPackage ./default.nix {
-			pkgs = pkgs;
-		};
 	in {
-		packages.${system} = packageSet;
+		packages.${system} = pkgs.callPackage ./lib/core/.nix/derivation.nix {
+			inherit pkgs;
+		};
 	};
 }
-- 
cgit v1.2.3