summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudius "keldu" Holeksa <mail@keldu.de>2024-03-05 15:56:46 +0100
committerClaudius "keldu" Holeksa <mail@keldu.de>2024-03-05 15:56:46 +0100
commit23887e1c2d30dc309976ee19742415b9e85315b4 (patch)
tree7b174ca0cda84f9950554618b578f9b99a6dcb15
parent488653602d0636a1fa5ef6e64cabb9b903dce42a (diff)
Fixing the nix setup
-rw-r--r--.nix/derivation.nix6
-rw-r--r--default.nix6
2 files changed, 5 insertions, 7 deletions
diff --git a/.nix/derivation.nix b/.nix/derivation.nix
index 7a6a170..cf1fe09 100644
--- a/.nix/derivation.nix
+++ b/.nix/derivation.nix
@@ -1,19 +1,17 @@
{ lib
-, stdenvNoCC
+, stdenv
, scons
-, clang
, clang-tools
, forstio
}:
-stdenvNoCC.mkDerivation {
+stdenv.mkDerivation {
pname = "kel-unit";
version = "0.0.0";
src = ./..;
nativeBuildInputs = [
scons
- clang
clang-tools
];
diff --git a/default.nix b/default.nix
index 2bb91d8..ec96333 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
{ pkgs ? import <nixpkgs> {}
-, clang ? pkgs.clang_15
+, stdenv ? pkgs.stdenv
, clang-tools ? pkgs.clang-tools_15
}:
@@ -9,12 +9,12 @@ let
ref = "dev";
}).outPath + "/default.nix"){
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
}).forstio;
in pkgs.callPackage ./.nix/derivation.nix {
inherit forstio;
- inherit clang;
+ inherit stdenv;
inherit clang-tools;
}