mirror of
https://github.com/fergalmoran/ladybird.git
synced 2025-12-22 09:19:03 +00:00
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:
@@ -1,25 +1,20 @@
|
|||||||
{ pkgs ? import <nixpkgs> { } }: with pkgs;
|
{ pkgs ? import <nixpkgs> { } }:
|
||||||
|
|
||||||
mkShell.override { stdenv = gcc13Stdenv; } {
|
pkgs.mkShell {
|
||||||
packages = [
|
packages = with pkgs; [
|
||||||
ccache
|
ccache
|
||||||
cmake
|
] ++ (with qt6Packages; [
|
||||||
libxcrypt
|
qtbase.dev
|
||||||
ninja
|
qttools
|
||||||
pkg-config
|
qtwayland.dev
|
||||||
python3
|
]);
|
||||||
qt6.qtbase
|
|
||||||
qt6.qtbase.dev
|
inputsFrom = [ pkgs.ladybird ];
|
||||||
qt6.qtmultimedia
|
|
||||||
qt6.qttools
|
|
||||||
qt6.qtwayland
|
|
||||||
qt6.qtwayland.dev
|
|
||||||
];
|
|
||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
# NOTE: This is required to make it find the wayland platform plugin installed
|
# NOTE: This is required to make it find the wayland platform plugin installed
|
||||||
# above, but should probably be fixed upstream.
|
# 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"
|
export QT_QPA_PLATFORM="wayland;xcb"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,6 @@
|
|||||||
outputs = { self, nixpkgs, utils, }: utils.lib.eachDefaultSystem (system: let
|
outputs = { self, nixpkgs, utils, }: utils.lib.eachDefaultSystem (system: let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
pkgs = import nixpkgs { inherit system; };
|
||||||
in {
|
in {
|
||||||
devShells.default = import ./Ladybird { inherit pkgs; };
|
devShells.default = import ./UI { inherit pkgs; };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user