From 23887e1c2d30dc309976ee19742415b9e85315b4 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Tue, 5 Mar 2024 15:56:46 +0100 Subject: Fixing the nix setup --- .nix/derivation.nix | 6 ++---- default.nix | 6 +++--- 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 {} -, 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; } -- cgit v1.2.3