aboutsummaryrefslogtreecommitdiffhomepage
path: root/nix
diff options
context:
space:
mode:
authorMihai Fufezan <[email protected]>2023-07-19 19:02:30 +0300
committerMihai Fufezan <[email protected]>2023-07-20 11:20:22 +0300
commit91e3c654d309c7723bef374cd4d1a0198a16ba53 (patch)
tree52f210610749a9f1a7287e5d93944a8d3cf896e4 /nix
parent7091d4e5979720ddb30f540b2d7da48080bf2487 (diff)
downloadHyprland-91e3c654d309c7723bef374cd4d1a0198a16ba53.tar.gz
Hyprland-91e3c654d309c7723bef374cd4d1a0198a16ba53.zip
Nix: move patches to subdir
Diffstat (limited to 'nix')
-rw-r--r--nix/default.nix4
-rw-r--r--nix/patches/meson-build.patch (renamed from nix/meson-build.patch)0
-rw-r--r--nix/patches/portals.patch (renamed from nix/portals.patch)0
-rw-r--r--nix/patches/wlroots-hidpi.patch (renamed from nix/wlroots-hidpi.patch)0
-rw-r--r--nix/patches/wlroots-nvidia.patch (renamed from nix/wlroots-nvidia.patch)0
-rw-r--r--nix/patches/xwayland-hidpi.patch (renamed from nix/xwayland-hidpi.patch)0
-rw-r--r--nix/patches/xwayland-vsync.patch (renamed from nix/xwayland-vsync.patch)0
-rw-r--r--nix/wlroots.nix8
8 files changed, 6 insertions, 6 deletions
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
index 2d058cc3..2d058cc3 100644
--- a/nix/meson-build.patch
+++ b/nix/patches/meson-build.patch
diff --git a/nix/portals.patch b/nix/patches/portals.patch
index 4d426dd5..4d426dd5 100644
--- a/nix/portals.patch
+++ b/nix/patches/portals.patch
diff --git a/nix/wlroots-hidpi.patch b/nix/patches/wlroots-hidpi.patch
index fd4c8955..fd4c8955 100644
--- a/nix/wlroots-hidpi.patch
+++ b/nix/patches/wlroots-hidpi.patch
diff --git a/nix/wlroots-nvidia.patch b/nix/patches/wlroots-nvidia.patch
index 130eb041..130eb041 100644
--- a/nix/wlroots-nvidia.patch
+++ b/nix/patches/wlroots-nvidia.patch
diff --git a/nix/xwayland-hidpi.patch b/nix/patches/xwayland-hidpi.patch
index a652ec85..a652ec85 100644
--- a/nix/xwayland-hidpi.patch
+++ b/nix/patches/xwayland-hidpi.patch
diff --git a/nix/xwayland-vsync.patch b/nix/patches/xwayland-vsync.patch
index 375db880..375db880 100644
--- a/nix/xwayland-vsync.patch
+++ b/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
]);
});
}