Nix: move patches to subdir

This commit is contained in:
Mihai Fufezan 2023-07-19 19:02:30 +03:00 committed by Mihai Fufezan
parent 7091d4e597
commit 91e3c654d3
8 changed files with 6 additions and 6 deletions

View file

@ -102,9 +102,9 @@ in
patches = [
# make meson use the provided wlroots instead of the git submodule
./meson-build.patch
./patches/meson-build.patch
# fixes portals search path to be picked up from $XDG_DESKTOP_PORTAL_DIR
./portals.patch
./patches/portals.patch
];
postPatch = ''

View file

@ -36,7 +36,7 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
(old.patches or [])
++ (lib.optionals (enableXWayland && hidpiXWayland) [
# adapted from https://gitlab.freedesktop.org/lilydjwg/wlroots/-/commit/6c5ffcd1fee9e44780a6a8792f74ecfbe24a1ca7
./wlroots-hidpi.patch
./patches/wlroots-hidpi.patch
(fetchpatch {
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/18595000f3a21502fd60bf213122859cc348f9af.diff";
sha256 = "sha256-jvfkAMh3gzkfuoRhB4E9T5X1Hu62wgUjj4tZkJm0mrI=";
@ -44,7 +44,7 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
})
])
++ (lib.optionals nvidiaPatches [
./wlroots-nvidia.patch
./patches/wlroots-nvidia.patch
]);
postPatch =
(old.postPatch or "")
@ -66,8 +66,8 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
patches =
(old.patches or [])
++ (lib.optionals hidpiXWayland [
./xwayland-vsync.patch
./xwayland-hidpi.patch
./patches/xwayland-vsync.patch
./patches/xwayland-hidpi.patch
]);
});
}