From c83af840a2375ba204a7b6baa59017a43bb568dc Mon Sep 17 00:00:00 2001
From: hmelder <service@hugomelder.com>
Date: Sun, 27 Oct 2024 02:54:11 +0200
Subject: [PATCH] Bump LLVM and Clang in dev shell

---
 shell.nix | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/shell.nix b/shell.nix
index e828e38..e2a894f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,15 +4,13 @@
 }:
 
 let
-    #unstablePkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz") {};
+  #unstablePkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz") {};
 in
 pkgs.mkShell {
   buildInputs = [
     # GStreamer
     pkgs.gst_all_1.gstreamer
-    pkgs.gst_all_1.gstreamer.dev
     pkgs.gst_all_1.gst-rtsp-server
-    pkgs.gst_all_1.gst-rtsp-server.dev
     pkgs.gst_all_1.gst-plugins-ugly # For x264enc element
     pkgs.gst_all_1.gst-plugins-bad # For intervideo* elements
     pkgs.gst_all_1.gst-plugins-base
@@ -20,39 +18,26 @@ pkgs.mkShell {
     pkgs.gst_all_1.gst-libav # For avenc_aac
     pkgs.gst_all_1.gst-vaapi
 
-    pkgs.llvmPackages_14.llvm
-    pkgs.llvmPackages_14.clang
-    pkgs.llvmPackages_14.lldb
-    pkgs.llvmPackages_14.lld
-    pkgs.clang-tools_14
-
-    # GNUstep
-    pkgs.gnustep.base
-    pkgs.gnustep.make
-
-    pkgs.glib
-    pkgs.glib.dev
-    pkgs.gobject-introspection
+    pkgs.clang_18
+    pkgs.lldb_18
+    pkgs.clang-tools_18
     pkgs.meson
     pkgs.pkg-config
     pkgs.ninja
 
-    # vaapi (vainfo)
-    pkgs.libva-utils
+    # GNUstep
+    pkgs.gnustep.base
+    pkgs.gnustep.make
 
     pkgs.graphviz
-
     pkgs.udev
-    pkgs.udev.dev
-
-    # MicroHTTPKit
-    pkgs.microhttpkit
-
     pkgs.libdispatch
-
-    # MicroHTTPKit Dev (TODO: Move into Libraries/nix)
-    pkgs.libmicrohttpd
+    pkgs.microhttpkit
+    pkgs.glib
     pkgs.xctest
+
+    # vaapi (vainfo)
+    pkgs.libva-utils
   ];
 
   shellHook = ''