hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed build for Nix/OS users

This commit is contained in:
Narice 2022-05-16 16:01:28 +01:00
parent 23c3534197
commit 0aacdbdfb6
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
flake.lock
View File

@ -68,11 +68,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1652574577, "lastModified": 1652659998,
"narHash": "sha256-MoSWPtue4Wi9+kRDxUbLWEBCL8Bswaa8kVMh2JYpSJg=", "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "118ec238bfb788a34f1d53c4d95931fadfa70367", "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,7 +138,8 @@
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"utils": "utils" "utils": "utils",
"wlroots-git": "wlroots-git"
} }
}, },
"utils": { "utils": {
@ -155,6 +156,24 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"wlroots-git": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1652629480,
"narHash": "sha256-4mouFPYB2VwgPi92trvAk8JAGjvkYm+DX72sUzljCXA=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "8fe3aa29da56be16faa73aca947647bd60cd4a94",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"type": "gitlab"
}
} }
}, },
"root": "root", "root": "root",

16
flake.nix
View File

@ -3,17 +3,23 @@
description = description =
"Hyprland is a dynamic tiling Wayland compositor that doesn't sacrifice on its looks."; "Hyprland is a dynamic tiling Wayland compositor that doesn't sacrifice on its looks.";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
wlroots-git = {
url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org";
flake = false;
};
}; };
outputs = { self, nixpkgs, utils, nixpkgs-wayland }: outputs = { self, nixpkgs, utils, nixpkgs-wayland, wlroots-git }:
{ {
overlay = final: prev: { overlay = final: prev: {
hyprland = prev.callPackage self { hyprland = prev.callPackage self {
src = self; src = self;
wlroots = (nixpkgs-wayland.overlays.default final prev).wlroots; wlroots = (nixpkgs-wayland.overlays.default final prev).wlroots.overrideAttrs (prev: rec {
src = wlroots-git;
});
}; };
}; };
overlays.default = self.overlay; overlays.default = self.overlay;
@ -23,7 +29,9 @@
packages = { packages = {
hyprland = pkgs.callPackage self { hyprland = pkgs.callPackage self {
src = self; src = self;
inherit (nixpkgs-wayland.packages.${system}) wlroots; wlroots = nixpkgs-wayland.packages.${system}.wlroots.overrideAttrs (prev: rec {
src = wlroots-git;
});
}; };
}; };
defaultPackage = packages.hyprland; defaultPackage = packages.hyprland;