cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nix: use CMake for builds instead of Meson

Browse source 
Build using submodules instead of patching the build process and using
Nix derivations of the subprojects.

From this commit on, you'll have to change the Hyprland flake url to
`git+https://github.com/hyprwm/Hyprland?submodules=1`
This commit is contained in:
Mihai Fufezan 2024-04-21 19:58:54 +03:00
parent 99aa34db6e
commit f15513309b
7 changed files with 49 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

25
flake.nix
View file

@ -7,14 +7,6 @@
# <https://github.com/nix-systems/nix-systems>
systems.url = "github:nix-systems/default-linux";
wlroots = {
type = "github";
owner = "hyprwm";
repo = "wlroots-hyprland";
rev = "5c1d51c5a2793480f5b6c4341ad0797052aec2ea";
flake = false;
};
hyprcursor = {
url = "github:hyprwm/hyprcursor";
inputs.nixpkgs.follows = "nixpkgs";
@ -22,12 +14,6 @@
inputs.hyprlang.follows = "hyprlang";
};
hyprland-protocols = {
url = "github:hyprwm/hyprland-protocols";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
hyprlang = {
url = "github:hyprwm/hyprlang";
inputs.nixpkgs.follows = "nixpkgs";
@ -44,7 +30,6 @@
url = "github:hyprwm/xdg-desktop-portal-hyprland";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
inputs.hyprland-protocols.follows = "hyprland-protocols";
inputs.hyprlang.follows = "hyprlang";
};
};
@ -92,8 +77,6 @@
# dependencies
hyprland-protocols
wlroots-hyprland
udis86
;
});
@ -103,13 +86,9 @@
stdenv = pkgsFor.${system}.gcc13Stdenv;
} {
name = "hyprland-shell";
nativeBuildInputs = with pkgsFor.${system}; [cmake python3 expat libxml2];
buildInputs = [self.packages.${system}.wlroots-hyprland];
nativeBuildInputs = with pkgsFor.${system}; [expat libxml2];
hardeningDisable = ["fortify"];
inputsFrom = [
self.packages.${system}.wlroots-hyprland
self.packages.${system}.hyprland
];
inputsFrom = [pkgsFor.${system}.hyprland];
};
});