summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.nix/derivation.nix2
-rw-r--r--default.nix9
2 files changed, 10 insertions, 1 deletions
diff --git a/.nix/derivation.nix b/.nix/derivation.nix
index 94f5bb7..9ec1e4b 100644
--- a/.nix/derivation.nix
+++ b/.nix/derivation.nix
@@ -2,6 +2,7 @@
, stdenvNoCC
, scons
, clang
+, clang-tools
, forstio
}:
@@ -13,6 +14,7 @@ stdenvNoCC.mkDerivation {
nativeBuildInputs = [
scons
clang
+ clang-tools;
];
buildInputs = [
diff --git a/default.nix b/default.nix
index c4bf675..2bb91d8 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,6 @@
{ pkgs ? import <nixpkgs> {}
+, clang ? pkgs.clang_15
+, clang-tools ? pkgs.clang-tools_15
}:
let
@@ -6,8 +8,13 @@ let
url = "git@git.keldu.de:forstio/forstio";
ref = "dev";
- }).outPath + "/default.nix"){}).forstio;
+ }).outPath + "/default.nix"){
+ inherit clang;
+ inherit clang-tools;
+ }).forstio;
in pkgs.callPackage ./.nix/derivation.nix {
inherit forstio;
+ inherit clang;
+ inherit clang-tools;
}