diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/dwl.nix | 8 | ||||
| -rw-r--r-- | packages/wlroots.nix | 45 |
2 files changed, 49 insertions, 4 deletions
diff --git a/packages/dwl.nix b/packages/dwl.nix index 637648a..950458e 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -11,7 +11,7 @@ , wayland-scanner , wayland , wayland-protocols -, wlroots_0_17 +, wlroots , writeText , xcbutilwm , xwayland @@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "compromyse"; repo = "dwl"; - rev = "master"; - hash = "sha256-KvbDzaTB3/3W0N14oCSCUbtuv8Z3GoCO3cIq8GwPgkk="; + rev = "compromyse"; + hash = "sha256-IlzzpSYKfmut4oFxtffneox44HDETmainP/Ulcl3NiE="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pixman wayland wayland-protocols - wlroots_0_17 + wlroots ] ++ lib.optionals enableXWayland [ libX11 xcbutilwm diff --git a/packages/wlroots.nix b/packages/wlroots.nix new file mode 100644 index 0000000..c7ec477 --- /dev/null +++ b/packages/wlroots.nix @@ -0,0 +1,45 @@ +args_@{ + lib, + fetchFromGitLab, + wlroots, + libdisplay-info, + hwdata, + lcms2, + ... +}: + +let + metadata = rec { + domain = "gitlab.freedesktop.org"; + owner = "wlroots"; + repo = "wlroots"; + repo_git = "https://${domain}/${owner}/${repo}"; + branch = "master"; + rev = "a8d1e5273abad02e594c4ad2f237a204ca239528"; + sha256 = "sha256-u1YttUkeA/vplXuQs27K38uqDZyBxXZHcbqz7ywRrVY="; + }; + ignore = [ + "wlroots" + "hwdata" + "libdisplay-info" + "lcms2" + ]; + args = lib.filterAttrs (n: _v: (!builtins.elem n ignore)) args_; +in +(wlroots.override args).overrideAttrs (old: { + version = "${metadata.rev}"; + buildInputs = old.buildInputs ++ [ + hwdata + libdisplay-info + lcms2 + ]; + src = fetchFromGitLab { + inherit (metadata) + domain + owner + repo + rev + sha256 + ; + }; +}) |