From 45243a96d24139f3ea4c4b44dcda0f217f325ae3 Mon Sep 17 00:00:00 2001
From: Jess <jess@jessie.cafe>
Date: Wed, 20 Nov 2024 15:11:10 +1300
Subject: [PATCH] flake: Fix broken dev-shell

Many dependencies aren't currently included in the devShell. As ladybird
is already packaged downstream, we can pull in those buildInputs along
with the extra dev dependencies already defined.
---
 UI/default.nix | 27 +++++++++++----------------
 flake.nix      |  2 +-
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/UI/default.nix b/UI/default.nix
index 8ed5734f57d..bce0045a15f 100644
--- a/UI/default.nix
+++ b/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"
   '';
 }
diff --git a/flake.nix b/flake.nix
index 8512f79d7e0..f13ebace7b2 100644
--- a/flake.nix
+++ b/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; };
   });
 }