From 81828fcbb77d9b2a12f50c6025078a895725419b Mon Sep 17 00:00:00 2001
From: ChUrl <christoph.urlacher@protonmail.com>
Date: Mon, 13 Nov 2023 16:17:37 +0100
Subject: [PATCH] Update C++ flakes

---
 env/flake_c++-with-libs.nix | 26 +++++++++++++-------------
 env/flake_c++.nix           | 21 +++++++++++++--------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/env/flake_c++-with-libs.nix b/env/flake_c++-with-libs.nix
index 77e4cf5c..e20df2fb 100644
--- a/env/flake_c++-with-libs.nix
+++ b/env/flake_c++-with-libs.nix
@@ -1,5 +1,5 @@
 {
-  description = "C/C++ Environment";
+  description = "C/C++ Environment with Libraries";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
@@ -50,11 +50,9 @@
         bintools = bintools_multi;
       };
     in {
-      # devShell = pkgs.devshell.mkShell ...
-      devShell = pkgs.devshell.mkShell {
-        name = "C/C++ Environment";
-
-        packages = with pkgs; [
+      # NOTE: We cannot use devshell, as it doesn't propagate library paths (yet?)
+      devShells.default = pkgs.mkShell {
+        buildInputs = with pkgs; [
           # Compilers
           bintools
           gcc13
@@ -73,14 +71,16 @@
           gdb
           # cling # To try out my bullshit implementations
           # doxygen # Generate docs + graphs
-        ];
 
-        commands = [
-          # {
-          #   name = "ide";
-          #   help = "Run clion for project";
-          #   command = "clion &>/dev/null ./ &";
-          # }
+          # C++ Libraries
+          # boost181
+          # raylib
+          # sfml
+
+          # C Libraries
+          # blas
+          # lapack
+          # libsvm
         ];
       };
     });
diff --git a/env/flake_c++.nix b/env/flake_c++.nix
index 0c5c3000..77e4cf5c 100644
--- a/env/flake_c++.nix
+++ b/env/flake_c++.nix
@@ -1,5 +1,5 @@
 {
-  description = "C/C++ Environment with Libraries";
+  description = "C/C++ Environment";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
@@ -50,9 +50,11 @@
         bintools = bintools_multi;
       };
     in {
-      # NOTE: We cannot use devshell, as it doesn't propagate library paths (yet?)
-      devShells.default = pkgs.mkShell {
-        buildInputs = with pkgs; [
+      # devShell = pkgs.devshell.mkShell ...
+      devShell = pkgs.devshell.mkShell {
+        name = "C/C++ Environment";
+
+        packages = with pkgs; [
           # Compilers
           bintools
           gcc13
@@ -71,11 +73,14 @@
           gdb
           # cling # To try out my bullshit implementations
           # doxygen # Generate docs + graphs
+        ];
 
-          # Libraries
-          # boost181
-          # raylib
-          # sfml
+        commands = [
+          # {
+          #   name = "ide";
+          #   help = "Run clion for project";
+          #   command = "clion &>/dev/null ./ &";
+          # }
         ];
       };
     });