summaryrefslogtreecommitdiff
path: root/default.nix
diff options
context:
space:
mode:
authorClaudius "keldu" Holeksa <mail@keldu.de>2023-10-24 14:23:28 +0200
committerClaudius "keldu" Holeksa <mail@keldu.de>2023-10-24 14:23:28 +0200
commit5212ea31af9b1f34a1f7400166563b945f94bc5c (patch)
treec09e97b93fbf42a4a6b8db040a07bb46919abd33 /default.nix
parent3788ee1d2daf257cf132803851f30ba06e71d8da (diff)
nix: Changing whole nix build setup to use stdenv
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix24
1 files changed, 12 insertions, 12 deletions
diff --git a/default.nix b/default.nix
index cf9ee19..397cf74 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.llvmPackages_16.stdenv
+, clang-tools ? pkgs.clang-tools_16
}:
let
@@ -9,63 +9,63 @@ in rec {
forstio = {
core = pkgs.callPackage c++/core/.nix/derivation.nix {
inherit version;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
test = pkgs.callPackage c++/test/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
async = pkgs.callPackage c++/async/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
codec = pkgs.callPackage c++/codec/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
codec-json = pkgs.callPackage c++/codec-json/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
io = pkgs.callPackage c++/io/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
io-tls = pkgs.callPackage c++/io-tls/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
window = pkgs.callPackage c++/window/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
window-opengl = pkgs.callPackage c++/window-opengl/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
};
@@ -73,7 +73,7 @@ in rec {
forstio-test-cases = pkgs.callPackage tests/.nix/derivation.nix {
inherit version;
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
};
}