mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-02 09:05:59 +01:00
Nix & Meson: switch to wlroots-hyprland
This commit is contained in:
parent
382b6d3f6b
commit
d8d0d3b20b
6 changed files with 20 additions and 22 deletions
22
flake.lock
22
flake.lock
|
@ -117,20 +117,18 @@
|
||||||
"wlroots": {
|
"wlroots": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"host": "gitlab.freedesktop.org",
|
"lastModified": 1712935342,
|
||||||
"lastModified": 1709983277,
|
"narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=",
|
||||||
"narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
|
"owner": "hyprwm",
|
||||||
"owner": "wlroots",
|
"repo": "wlroots-hyprland",
|
||||||
"repo": "wlroots",
|
"rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
|
||||||
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
|
"type": "github"
|
||||||
"type": "gitlab"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"host": "gitlab.freedesktop.org",
|
"owner": "hyprwm",
|
||||||
"owner": "wlroots",
|
"repo": "wlroots-hyprland",
|
||||||
"repo": "wlroots",
|
"rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
|
||||||
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
|
"type": "github"
|
||||||
"type": "gitlab"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"xdph": {
|
"xdph": {
|
||||||
|
|
|
@ -8,10 +8,9 @@
|
||||||
systems.url = "github:nix-systems/default-linux";
|
systems.url = "github:nix-systems/default-linux";
|
||||||
|
|
||||||
wlroots = {
|
wlroots = {
|
||||||
type = "gitlab";
|
type = "github";
|
||||||
host = "gitlab.freedesktop.org";
|
owner = "hyprwm";
|
||||||
owner = "wlroots";
|
repo = "wlroots-hyprland";
|
||||||
repo = "wlroots";
|
|
||||||
rev = "62eeffbe233d199f520a5755c344e85f8eab7940";
|
rev = "62eeffbe233d199f520a5755c344e85f8eab7940";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
|
@ -33,7 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
|
||||||
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
||||||
endif
|
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')
|
have_xwlr = wlroots.get_variable('features').get('xwayland')
|
||||||
xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
wayland,
|
wayland,
|
||||||
wayland-protocols,
|
wayland-protocols,
|
||||||
wayland-scanner,
|
wayland-scanner,
|
||||||
wlroots,
|
wlroots-hyprland,
|
||||||
xcbutilwm,
|
xcbutilwm,
|
||||||
xwayland,
|
xwayland,
|
||||||
debug ? false,
|
debug ? false,
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
|
assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
|
||||||
assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` 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
|
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
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "hyprland${lib.optionalString debug "-debug"}";
|
pname = "hyprland${lib.optionalString debug "-debug"}";
|
||||||
|
@ -101,7 +101,8 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
wlr.buildInputs
|
||||||
|
++ [
|
||||||
cairo
|
cairo
|
||||||
git
|
git
|
||||||
hyprcursor.dev
|
hyprcursor.dev
|
||||||
|
|
|
@ -34,8 +34,8 @@ in {
|
||||||
stdenv = final.gcc13Stdenv;
|
stdenv = final.gcc13Stdenv;
|
||||||
version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
|
version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
|
||||||
commit = self.rev or "";
|
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
|
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;
|
inherit date;
|
||||||
};
|
};
|
||||||
hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
|
hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
|
||||||
|
|
|
@ -6,7 +6,7 @@ index 1d2c7f9f..c5ef4e67 100644
|
||||||
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
||||||
endif
|
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')
|
-have_xwlr = wlroots.get_variable('features').get('xwayland')
|
||||||
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
||||||
-
|
-
|
||||||
|
|
Loading…
Reference in a new issue