beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

flake: Fix broken dev-shell

Browse source 
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 45243a96d2
No known key found for this signature in database
GPG key ID: BA3350686C918606
2 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
UI/default.nix
View file

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

2
flake.nix
View file

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