diff options
| author | Mihai Fufezan <[email protected]> | 2024-02-09 09:53:57 +0200 |
|---|---|---|
| committer | Mihai Fufezan <[email protected]> | 2024-02-09 09:53:57 +0200 |
| commit | b0159a73f47e654ac62fe0dc3c93974acfc600ed (patch) | |
| tree | 031fb60f7261940cd4ff45adec984a0c82049b48 | |
| parent | 1713221ba2764df9396d000bf08f0dc2aabd1a05 (diff) | |
| download | Hyprland-b0159a73f47e654ac62fe0dc3c93974acfc600ed.tar.gz Hyprland-b0159a73f47e654ac62fe0dc3c93974acfc600ed.zip | |
Meson & Nix: build with hyprlang
| -rw-r--r-- | flake.lock | 23 | ||||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | nix/default.nix | 2 | ||||
| -rw-r--r-- | nix/overlays.nix | 1 | ||||
| -rw-r--r-- | nix/patches/meson-build.patch | 5 | ||||
| -rw-r--r-- | src/meson.build | 1 |
6 files changed, 35 insertions, 4 deletions
@@ -26,6 +26,26 @@ "hyprlang": { "inputs": { "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707453316, + "narHash": "sha256-5rE0VX2c95Dtnn420OCmI4rRtW2SEC1+J6AQKg1IoUc=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "ab007915f7ede0e47fb922496f21e3210d165df2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "nixpkgs": [ "xdph", "nixpkgs" ] @@ -63,6 +83,7 @@ "root": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": "nixpkgs", "systems": "systems", "wlroots": "wlroots", @@ -108,7 +129,7 @@ "hyprland-protocols": [ "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs" ], @@ -22,6 +22,11 @@ inputs.systems.follows = "systems"; }; + hyprlang = { + url = "github:hyprwm/hyprlang"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + xdph = { url = "github:hyprwm/xdg-desktop-portal-hyprland"; inputs.nixpkgs.follows = "nixpkgs"; @@ -86,7 +91,7 @@ name = "hyprland-shell"; nativeBuildInputs = with pkgsFor.${system}; [cmake python3]; buildInputs = [self.packages.${system}.wlroots-hyprland]; - hardeningDisable = [ "fortify" ]; + hardeningDisable = ["fortify"]; inputsFrom = [ self.packages.${system}.wlroots-hyprland self.packages.${system}.hyprland diff --git a/nix/default.nix b/nix/default.nix index 751457ca..6062a215 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -9,6 +9,7 @@ cairo, git, hyprland-protocols, + hyprlang, jq, libGL, libdrm, @@ -75,6 +76,7 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov cairo git hyprland-protocols + hyprlang libdrm libGL libinput diff --git a/nix/overlays.nix b/nix/overlays.nix index afdde162..3eedd84c 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -22,6 +22,7 @@ in { hyprland-packages = lib.composeManyExtensions [ # Dependencies inputs.hyprland-protocols.overlays.default + inputs.hyprlang.overlays.default self.overlays.wlroots-hyprland self.overlays.udis86 # Hyprland packages themselves diff --git a/nix/patches/meson-build.patch b/nix/patches/meson-build.patch index 844eacae..5911657e 100644 --- a/nix/patches/meson-build.patch +++ b/nix/patches/meson-build.patch @@ -34,16 +34,17 @@ index 1d2c7f9f..c5ef4e67 100644 headers = globber.stdout().strip().split('\n') foreach file : headers diff --git a/src/meson.build b/src/meson.build -index 0af864b9..38723b8c 100644 +index 45701f5f..3505cefe 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -9,16 +9,16 @@ executable('Hyprland', src, +@@ -9,17 +9,17 @@ executable('Hyprland', src, server_protos, dependency('wayland-server'), dependency('wayland-client'), - wlroots.get_variable('wlroots'), + dependency('wlroots'), dependency('cairo'), + dependency('hyprlang', version: '>= 0.2.1'), dependency('libdrm'), dependency('egl'), dependency('xkbcommon'), diff --git a/src/meson.build b/src/meson.build index 0af864b9..2977a69d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -11,6 +11,7 @@ executable('Hyprland', src, dependency('wayland-client'), wlroots.get_variable('wlroots'), dependency('cairo'), + dependency('hyprlang', version: '>= 0.2.1'), dependency('libdrm'), dependency('egl'), dependency('xkbcommon'), |