hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix: move patches to subdir

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/default.nix
View file

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

0
nix/meson-build.patch → nix/patches/meson-build.patch
View file

0
nix/portals.patch → nix/patches/portals.patch
View file

0
nix/wlroots-hidpi.patch → nix/patches/wlroots-hidpi.patch
View file

0
nix/wlroots-nvidia.patch → nix/patches/wlroots-nvidia.patch
View file

0
nix/xwayland-hidpi.patch → nix/patches/xwayland-hidpi.patch
View file

0
nix/xwayland-vsync.patch → nix/patches/xwayland-vsync.patch
View file

8
nix/wlroots.nix
View file

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