alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #245892 from wineee/cage-15

Browse source 
cage: 0.1.4 ->0.1.5
This commit is contained in:
Nick Cao 2023-07-28 18:26:50 -06:00 committed by GitHub
parent a324350738 71302e5c14
commit 922a0b13ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/window-managers/cage/default.nix
View file

@ -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) ''

2
pkgs/top-level/all-packages.nix
View file

@ -30379,7 +30379,7 @@ with pkgs;
cardo = callPackage ../data/fonts/cardo { };
cage = callPackage ../applications/window-managers/cage {
wlroots = wlroots_0_14;
wlroots = wlroots_0_16;
};
calf = callPackage ../applications/audio/calf {