Merge pull request #276322 from wineee/wlroots
wlroots: 0.17.0 -> 0.17.1
This commit is contained in:
commit
82ec4173ce
@ -17,6 +17,7 @@
|
||||
, xorg
|
||||
, libpng
|
||||
, ffmpeg_4
|
||||
, ffmpeg
|
||||
, hwdata
|
||||
, seatd
|
||||
, vulkan-loader
|
||||
@ -57,7 +58,6 @@ let
|
||||
++ extraNativeBuildInputs;
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg_4
|
||||
libGL
|
||||
libcap
|
||||
libinput
|
||||
@ -116,6 +116,9 @@ rec {
|
||||
wlroots_0_15 = generic {
|
||||
version = "0.15.1";
|
||||
hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
|
||||
extraBuildInputs = [
|
||||
ffmpeg_4
|
||||
];
|
||||
};
|
||||
|
||||
wlroots_0_16 = generic {
|
||||
@ -125,23 +128,20 @@ rec {
|
||||
substituteInPlace backend/drm/meson.build \
|
||||
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
||||
'';
|
||||
extraBuildInputs = [
|
||||
ffmpeg_4
|
||||
];
|
||||
};
|
||||
|
||||
wlroots_0_17 = generic {
|
||||
version = "0.17.0";
|
||||
hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c=";
|
||||
version = "0.17.1";
|
||||
hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI=";
|
||||
extraBuildInputs = [
|
||||
ffmpeg
|
||||
hwdata
|
||||
libliftoff
|
||||
libdisplay-info
|
||||
];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch";
|
||||
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch";
|
||||
hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
wlroots = wlroots_0_17;
|
||||
|
Loading…
Reference in New Issue
Block a user