public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cage: 2020-01-18 -> 0.1.2.1 (#93340)

Browse Source
This commit is contained in:
Michael Weiss 2020-07-17 15:21:44 +02:00 committed by GitHub
parent daa6298c96
commit 1857b270f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/applications/window-managers/cage/default.nix
View File

@ -1,45 +1,45 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, makeWrapper , meson, ninja, pkg-config, wayland, scdoc, makeWrapper
, wlroots, wayland, wayland-protocols, pixman, libxkbcommon , wlroots, wayland-protocols, pixman, libxkbcommon
, systemd, libGL, libX11 , systemd, libGL, libX11
, xwayland ? null , xwayland ? null
, nixosTests
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cage-unstable"; pname = "cage";
version = "2020-01-18"; version = "0.1.2.1";
# The last stable release (0.1.1) would require at least the following 3 patches:
# - https://github.com/Hjdskes/cage/commit/33bb3c818c5971777b6f09d8821e7f078d38d262.patch
# - https://github.com/Hjdskes/cage/commit/51e6c760da51e2b885737d61a61cdc965bb9269d.patch
# - https://github.com/Hjdskes/cage/commit/84216ca2a417b237ad61c11e2f3ebbcb91681ece.patch
# Which need to be adapted due to other changes. At this point it seems
# better to use the current master version until the next stable release.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Hjdskes"; owner = "Hjdskes";
repo = "cage"; repo = "cage";
rev = "cc1f975c442ebd691b70196d76aa120ead717810"; rev = "v${version}";
sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g"; sha256 = "1i4rm3dpmk7gkl6hfs6a7vwz76ba7yqcdp63nlrdbnq81m9cy2am";
}; };
nativeBuildInputs = [ meson ninja pkgconfig makeWrapper wayland ]; postPatch = ''
substituteInPlace meson.build --replace \
"0.1.2" "${version}"
'';
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
buildInputs = [ buildInputs = [
wlroots wayland wayland-protocols pixman libxkbcommon wlroots wayland wayland-protocols pixman libxkbcommon
# TODO: Not specified but required:
systemd libGL libX11 systemd libGL libX11
]; ];
enableParallelBuilding = true;
mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ]; mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ];
postFixup = stdenv.lib.optionalString (xwayland != null) '' postFixup = stdenv.lib.optionalString (xwayland != null) ''
wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
''; '';
# Tests Cage using the NixOS module by launching xterm:
passthru.tests.basic-nixos-module-functionality = nixosTests.cage;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Wayland kiosk"; description = "A Wayland kiosk that runs a single, maximized application";
homepage = "https://www.hjdskes.nl/projects/cage/"; homepage = "https://www.hjdskes.nl/projects/cage/";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;