10 files changed, 20 insertions, 40 deletions
diff --git a/c++/async/.nix/derivation.nix b/c++/async/.nix/derivation.nix
index b1c6ecc..aad258f 100644
--- a/c++/async/.nix/derivation.nix
+++ b/c++/async/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -9,7 +8,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-async";
   inherit version;
   src = ./..;
@@ -18,7 +17,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/codec-json/.nix/derivation.nix b/c++/codec-json/.nix/derivation.nix
index 0f701c9..3738e43 100644
--- a/c++/codec-json/.nix/derivation.nix
+++ b/c++/codec-json/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -9,7 +8,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-codec-json";
   inherit version;
   src = ./..;
@@ -18,7 +17,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/codec/.nix/derivation.nix b/c++/codec/.nix/derivation.nix
index 768dc6e..bcf2be7 100644
--- a/c++/codec/.nix/derivation.nix
+++ b/c++/codec/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -9,7 +8,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-codec";
   inherit version;
   src = ./..;
@@ -22,7 +21,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/core/.nix/derivation.nix b/c++/core/.nix/derivation.nix
index 26acd3d..1618651 100644
--- a/c++/core/.nix/derivation.nix
+++ b/c++/core/.nix/derivation.nix
@@ -1,12 +1,11 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 }:
 
-stdenvNoCC.mkDerivation {
+stdenv.mkDerivation {
   pname = "forstio-core";
   inherit version;
   src = ./..;
@@ -15,7 +14,6 @@ stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/io-tls/.nix/derivation.nix b/c++/io-tls/.nix/derivation.nix
index a08b195..23d8ba6 100644
--- a/c++/io-tls/.nix/derivation.nix
+++ b/c++/io-tls/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -10,7 +9,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-io-tls";
   inherit version;
   src = ./..;
@@ -19,7 +18,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/io/.nix/derivation.nix b/c++/io/.nix/derivation.nix
index 39d7568..a14bd34 100644
--- a/c++/io/.nix/derivation.nix
+++ b/c++/io/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -9,7 +8,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-io";
   inherit version;
   src = ./..;
@@ -18,7 +17,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/io_codec/.nix/derivation.nix b/c++/io_codec/.nix/derivation.nix
index 2ea0913..7cd55a8 100644
--- a/c++/io_codec/.nix/derivation.nix
+++ b/c++/io_codec/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -9,7 +8,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-io_codec";
   inherit version;
   src = ./..;
@@ -18,7 +17,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/test/.nix/derivation.nix b/c++/test/.nix/derivation.nix
index 750d8ed..c15421d 100644
--- a/c++/test/.nix/derivation.nix
+++ b/c++/test/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -9,7 +8,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-test";
   inherit version;
   src = ./..;
@@ -18,7 +17,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/window-opengl/.nix/derivation.nix b/c++/window-opengl/.nix/derivation.nix
index 95ef1e8..40c25bb 100644
--- a/c++/window-opengl/.nix/derivation.nix
+++ b/c++/window-opengl/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -11,7 +10,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-window-opengl";
   inherit version;
   src = ./..;
@@ -20,7 +19,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];
 
diff --git a/c++/window/.nix/derivation.nix b/c++/window/.nix/derivation.nix
index 9974564..67a682c 100644
--- a/c++/window/.nix/derivation.nix
+++ b/c++/window/.nix/derivation.nix
@@ -1,7 +1,6 @@
 { lib
-, stdenvNoCC
+, stdenv
 , scons
-, clang
 , clang-tools
 , version
 , forstio
@@ -10,7 +9,7 @@
 
 let
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   pname = "forstio-window";
   inherit version;
   src = ./..;
@@ -19,7 +18,6 @@ in stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     scons
-    clang
     clang-tools
   ];