diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-29 06:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-29 06:01:06 +0000 |
| commit | d64d339ecfb81e196331823779c36b8e2b41f7cc (patch) | |
| tree | 06a5f0eba00d2e4cf7534f7a158f43ad507e6c2a /pkgs/applications/window-managers | |
| parent | e6cd0a7c69ad129e8569ef513f619693db2bb7e7 (diff) | |
| parent | a4c0bbf98b10494bcef9b61aebd0683e3558fe42 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/cage/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index fafad73527dcb..6c56c75418f92 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper -, wlroots, wayland, wayland-protocols, pixman, libxkbcommon +, wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm , systemd, libGL, libX11, mesa , xwayland ? null , nixosTests @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cage"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "Hjdskes"; repo = "cage"; rev = "v${version}"; - sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6"; + hash = "sha256-Suq14YRw/MReDRvO/TQqjpZvpzAEDnHUyVbQj0BPT4c="; }; depsBuildBuild = [ @@ -24,15 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ - wlroots wayland wayland-protocols pixman libxkbcommon + wlroots wayland wayland-protocols pixman libxkbcommon xcbutilwm mesa # for libEGL headers systemd libGL libX11 ]; - # https://github.com/cage-kiosk/cage/issues/231 - # cage will segfault on start with `-m last` without this - CFLAGS = "-O0"; - mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ]; postFixup = lib.optionalString (xwayland != null) '' |