summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Fufezan <mihai@fufexan.net>2024-04-12 20:35:31 +0300
committerMihai Fufezan <mihai@fufexan.net>2024-04-12 20:39:00 +0300
commitd8d0d3b20bdb4e4320989349dacd6deb17cfb619 (patch)
treee64d1896bc84646f82b9e18165aa1534a60b0bd3
parent382b6d3f6b26284388cfe3181c447f11a8dc9bee (diff)
Nix & Meson: switch to wlroots-hyprland
-rw-r--r--flake.lock22
-rw-r--r--flake.nix7
-rw-r--r--meson.build2
-rw-r--r--nix/default.nix7
-rw-r--r--nix/overlays.nix2
-rw-r--r--nix/patches/meson-build.patch2
6 files changed, 20 insertions, 22 deletions
diff --git a/flake.lock b/flake.lock
index a68da696..518bfdf9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -117,20 +117,18 @@
"wlroots": {
"flake": false,
"locked": {
- "host": "gitlab.freedesktop.org",
- "lastModified": 1709983277,
- "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
- "owner": "wlroots",
- "repo": "wlroots",
- "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
- "type": "gitlab"
+ "lastModified": 1712935342,
+ "narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=",
+ "owner": "hyprwm",
+ "repo": "wlroots-hyprland",
+ "rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
+ "type": "github"
},
"original": {
- "host": "gitlab.freedesktop.org",
- "owner": "wlroots",
- "repo": "wlroots",
- "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
- "type": "gitlab"
+ "owner": "hyprwm",
+ "repo": "wlroots-hyprland",
+ "rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
+ "type": "github"
}
},
"xdph": {
diff --git a/flake.nix b/flake.nix
index 4f36a59c..edcbeff4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,9 @@
systems.url = "github:nix-systems/default-linux";
wlroots = {
- type = "gitlab";
- host = "gitlab.freedesktop.org";
- owner = "wlroots";
- repo = "wlroots";
+ type = "github";
+ owner = "hyprwm";
+ repo = "wlroots-hyprland";
rev = "62eeffbe233d199f520a5755c344e85f8eab7940";
flake = false;
};
diff --git a/meson.build b/meson.build
index 81d6e403..28e652d7 100644
--- a/meson.build
+++ b/meson.build
@@ -33,7 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
endif
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
have_xwlr = wlroots.get_variable('features').get('xwayland')
xcb_dep = dependency('xcb', required: get_option('xwayland'))
diff --git a/nix/default.nix b/nix/default.nix
index 907c6fec..a7679672 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -28,7 +28,7 @@
wayland,
wayland-protocols,
wayland-scanner,
- wlroots,
+ wlroots-hyprland,
xcbutilwm,
xwayland,
debug ? false,
@@ -47,7 +47,7 @@
assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; let
- wlr = wlroots.override {inherit enableXWayland;};
+ wlr = wlroots-hyprland.override {inherit enableXWayland;};
in
stdenv.mkDerivation {
pname = "hyprland${lib.optionalString debug "-debug"}";
@@ -101,7 +101,8 @@ in
];
buildInputs =
- [
+ wlr.buildInputs
+ ++ [
cairo
git
hyprcursor.dev
diff --git a/nix/overlays.nix b/nix/overlays.nix
index c216ff53..97e66912 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -34,8 +34,8 @@ in {
stdenv = final.gcc13Stdenv;
version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
commit = self.rev or "";
- wlroots = final.wlroots-hyprland; # explicit override until decided on breaking change of the name
udis86 = final.udis86-hyprland; # explicit override until decided on breaking change of the name
+ inherit (final) wlroots-hyprland; # explicit override until decided on breaking change of the name
inherit date;
};
hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
diff --git a/nix/patches/meson-build.patch b/nix/patches/meson-build.patch
index 7f372107..21cec8ee 100644
--- a/nix/patches/meson-build.patch
+++ b/nix/patches/meson-build.patch
@@ -6,7 +6,7 @@ index 1d2c7f9f..c5ef4e67 100644
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
endif
--wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+-wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
-have_xwlr = wlroots.get_variable('features').get('xwayland')
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
-