Bump 20231122-2

pkgs/gamescope-git/default.nix

@@ -1,4 +1,4 @@
-{ final, prev, gitOverride, ... }:
+{ final, prev, gitOverride, nyxUtils, ... }:
 
 gitOverride {
   newInputs = with final; {
@@ -22,13 +22,15 @@ gitOverride {
   ref = "master";
 
   postOverride = prevAttrs: {
-    patches = prevAttrs.patches ++ [
-      # allows usage with latest wlroots
-      (final.fetchpatch2 {
-        url = "https://github.com/ValveSoftware/gamescope/commit/d4ca57e1f4afe0b0798bf71406b1430a915a7bb3.patch";
-        hash = "sha256-XG8114bHGuhW7WmXufPMVf2yFKml8A4uTP3ucvIiH2I=";
-      })
-    ];
+    buildInputs = with final; [ xorg.xcbutilwm xorg.xcbutilerrors ] ++ prevAttrs.buildInputs;
+
+    patches =
+      (nyxUtils.removeByBaseName "use-pkgconfig.patch" prevAttrs.patches)
+      ++ [ ./use-pkgconfig.patch ];
+
+    postInstall = prevAttrs.postInstall + ''
+      rm -r $out/include $lib/lib/pkgconfig $lib/lib/libwlroots.a
+    '';
 
     # erase wlroots replacement since we're fetching submodules.
     postUnpack = "";

pkgs/gamescope-git/use-pkgconfig.patch

@@ -0,0 +1,11 @@
+diff --git a/meson.build b/meson.build
+index 1311784..77043ac 100644
+--- a/meson.build
++++ b/meson.build
+@@ -6,7 +6,6 @@ project(
+   default_options: [
+     'cpp_std=c++14',
+     'warning_level=2',
+-    'force_fallback_for=wlroots,libliftoff,vkroots',
+   ],
+ )

pkgs/gamescope-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20231121223853-e384c4e",
-  "rev": "e384c4e066a51cae3c22722e8c9409aae5a826bd",
-  "hash": "sha256-WF/JVm6ZUGG6I7hY/vcOlFjYA7IcW37f0ZZu0lcwN1I="
+  "version": "unstable-20231122142219-4a067fb",
+  "rev": "4a067fb4ebe2291a1acaab77205cc1ed3bd19e86",
+  "hash": "sha256-lHg9QGBV6Nhsu9Zdy3NlumUt19QzN6kMnr0ZLVgmaWs="
 }

pkgs/glib-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20231122104501-c7a0228",
-  "rev": "c7a02280f5cf544f4a2bd074705102d778c16708",
-  "hash": "sha256-LmpSJdWLQBAwnha1TvWJHp83QytOlEeK8g5JyGRa/Fk="
+  "version": "unstable-20231010212346-2f5088b",
+  "rev": "2f5088b7b6fd4b3e62a33d8336acd01ea3f63834",
+  "hash": "sha256-kBw4HqS98sOuBJ9HqZW2RuYY7AMosg7d0udxI0IYqAA="
 }

pkgs/mesa-git/default.nix

@@ -9,8 +9,18 @@
 , ...
 }:
 
+let
+  inherit (final.stdenv) is32bit;
+  inherit (final.lib) optional;
+
+  problematicCommit = final.fetchpatch {
+    url = "https://github.com/chaotic-cx/mesa-mirror/commit/e4ffb2473b59dd98ea0b400a47b6b50beda3dbf2.patch";
+    hash = "sha256-5f80Ru1SdrkfSC+uG/haTF7Z7I6LetGY3WiownRdHfE=";
+    revert = true;
+  };
+in
 gitOverride (current: {
-  nyxKey = if final.stdenv.is32bit then "mesa32_git" else "mesa_git";
+  nyxKey = if is32bit then "mesa32_git" else "mesa_git";
   prev = prev.mesa;
 
   versionNyxPath = "pkgs/mesa-git/version.json";
@@ -19,7 +29,7 @@ gitOverride (current: {
     owner = "chaotic-cx";
     repo = "mesa-mirror";
   };
-  withUpdateScript = !final.stdenv.is32bit;
+  withUpdateScript = !is32bit;
   version = builtins.substring 0 (builtins.stringLength prev.mesa.version) current.rev;
 
   postOverride = prevAttrs: {
@@ -38,7 +48,7 @@ gitOverride (current: {
         ./opencl.patch
         ./disk_cache-include-dri-driver-path-in-cache-key.patch
         ./gbm-backend.patch
-      ];
+      ] ++ optional is32bit problematicCommit;
     # expose gbm backend and rename vendor (if necessary)
     outputs =
       if gbmDriver

pkgs/telegram-desktop-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20231122081845-b60e50d",
-  "rev": "b60e50df105db8baa4e0d578895bf5be1f6d5dda",
-  "hash": "sha256-AU17GVL8xHMgrfQr0GSjMGuKYB3xp8F1BWfHw9R8pGk="
+  "version": "unstable-20231119034632-a92e9f7",
+  "rev": "a92e9f71623f5593e15600603a927c0cf2a29329",
+  "hash": "sha256-qilHCo/4kB3inYj2WAAaWYybD91PGq0HE6ezc3SE+/8="
 }

pkgs/vulkan-versioned/fix-pkgconfig.patch

@@ -1,11 +1,12 @@
 diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
-index 16b0ded..6f725cc 100644
+index 6a285f2..03ff061 100644
 --- a/loader/vulkan.pc.in
 +++ b/loader/vulkan.pc.in
-@@ -1,4 +1,5 @@
+@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@
  Name: Vulkan-Loader
  Description: Vulkan Loader
  Version: @VULKAN_LOADER_VERSION@
--Libs: -L@CMAKE_INSTALL_LIBDIR_PC@ -lvulkan@VULKAN_LIB_SUFFIX@
+-Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@
+-Cflags: -I${includedir}
 +Libs: -L@CMAKE_INSTALL_LIBDIR@ -lvulkan@VULKAN_LIB_SUFFIX@
 +Cflags: -I@CMAKE_INSTALL_INCLUDEDIR@

pkgs/yt-dlp-git/default.nix

@@ -40,7 +40,11 @@ in
 
       UPDATE_HINT = None
 
-      CHANNEL = 'chaotic-nyx'
+      CHANNEL = 'master'
+
+      ORIGIN = 'chaotic-cx/nyx'
+
+      _pkg_version = '${datedVersion}'
             " > yt_dlp/version.py
     '';
   };