cage: 0.2.1 -> 0.3.0 (#513156)
This commit is contained in:
@@ -2,14 +2,13 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wayland-scanner,
|
||||
scdoc,
|
||||
makeWrapper,
|
||||
wlroots_0_19,
|
||||
wlroots_0_20,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
pixman,
|
||||
@@ -23,25 +22,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cage";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cage-kiosk";
|
||||
repo = "cage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-P9MhIl2YIE2hwT5Yr0Cpes5S12evb0aj9oOPLeehkw0=";
|
||||
hash = "sha256-NLoz11bfeZwesmwLmyytuB6/vSwIsnDWKzyAXFe+YZ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# backport of https://github.com/cage-kiosk/cage/pull/461
|
||||
# to fix https://github.com/cage-kiosk/cage/issues/456
|
||||
# remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cage-kiosk/cage/commit/832e88b0c964a324bb09c7af02ed0650b73dfb9b.patch";
|
||||
hash = "sha256-8dyJL46xXGkw3pF9uskX8H72s0hUO1BhU2UMaoEwz4U=";
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
@@ -56,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wlroots_0_19
|
||||
wlroots_0_20
|
||||
wayland
|
||||
wayland-protocols
|
||||
pixman
|
||||
@@ -66,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libx11
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString wlroots_0_19.enableXWayland ''
|
||||
postFixup = lib.optionalString wlroots_0_20.enableXWayland ''
|
||||
wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user