diff --git a/nix/default.nix b/nix/default.nix index f4c96008..8970117a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -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 = '' diff --git a/nix/meson-build.patch b/nix/patches/meson-build.patch similarity index 100% rename from nix/meson-build.patch rename to nix/patches/meson-build.patch diff --git a/nix/portals.patch b/nix/patches/portals.patch similarity index 100% rename from nix/portals.patch rename to nix/patches/portals.patch diff --git a/nix/wlroots-hidpi.patch b/nix/patches/wlroots-hidpi.patch similarity index 100% rename from nix/wlroots-hidpi.patch rename to nix/patches/wlroots-hidpi.patch diff --git a/nix/wlroots-nvidia.patch b/nix/patches/wlroots-nvidia.patch similarity index 100% rename from nix/wlroots-nvidia.patch rename to nix/patches/wlroots-nvidia.patch diff --git a/nix/xwayland-hidpi.patch b/nix/patches/xwayland-hidpi.patch similarity index 100% rename from nix/xwayland-hidpi.patch rename to nix/patches/xwayland-hidpi.patch diff --git a/nix/xwayland-vsync.patch b/nix/patches/xwayland-vsync.patch similarity index 100% rename from nix/xwayland-vsync.patch rename to nix/patches/xwayland-vsync.patch diff --git a/nix/wlroots.nix b/nix/wlroots.nix index 2b93da9d..f416a7dc 100644 --- a/nix/wlroots.nix +++ b/nix/wlroots.nix @@ -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 ]); }); }