Merge 45243a96d2 into d6bcd3fb0b

UI/default.nix

@@ -1,25 +1,20 @@
-{ pkgs ? import <nixpkgs> { } }: with pkgs;
+{ pkgs ? import <nixpkgs> { } }:
 
-mkShell.override { stdenv = gcc13Stdenv; } {
-  packages = [
+pkgs.mkShell {
+  packages = with pkgs; [
     ccache
-    cmake
-    libxcrypt
-    ninja
-    pkg-config
-    python3
-    qt6.qtbase
-    qt6.qtbase.dev
-    qt6.qtmultimedia
-    qt6.qttools
-    qt6.qtwayland
-    qt6.qtwayland.dev
-  ];
+  ] ++ (with qt6Packages; [
+    qtbase.dev
+    qttools
+    qtwayland.dev
+  ]);
+
+  inputsFrom = [ pkgs.ladybird ];
 
   shellHook = ''
     # NOTE: This is required to make it find the wayland platform plugin installed
     #       above, but should probably be fixed upstream.
-    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH:${qt6.qtwayland}/lib/qt-6/plugins"
+    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH:${pkgs.qt6.qtwayland}/lib/qt-6/plugins"
     export QT_QPA_PLATFORM="wayland;xcb"
   '';
 }

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,6 +9,6 @@
   outputs = { self, nixpkgs, utils, }: utils.lib.eachDefaultSystem (system: let
     pkgs = import nixpkgs { inherit system; };
   in {
-    devShells.default = import ./Ladybird { inherit pkgs; };
+    devShells.default = import ./UI { inherit pkgs; };
   });
 }