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.
This commit is contained in:
Jess 2024-11-20 15:11:10 +13:00
parent 297557f76d
commit 6e2cdfbf94
No known key found for this signature in database
GPG key ID: BA3350686C918606
2 changed files with 12 additions and 17 deletions

View file

@ -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"
'';
}

View file

@ -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; };
});
}