Merge pull request #122059 from AndersonTorres/quick-patches

cagebreak: 1.7.0 -> 1.7.1
This commit is contained in:
Anderson Torres 2021-05-07 16:34:42 -03:00 committed by GitHub
commit 87f9307b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,7 +9,6 @@
, meson
, ninja
, nixosTests
, pandoc
, pango
, pixman
, pkg-config
@ -23,20 +22,19 @@
stdenv.mkDerivation rec {
pname = "cagebreak";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "project-repo";
repo = pname;
rev = version;
hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI=";
hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE=";
};
nativeBuildInputs = [
makeWrapper
meson
ninja
pandoc
pkg-config
scdoc
wayland
@ -55,37 +53,33 @@ stdenv.mkDerivation rec {
wlroots
];
outputs = [
"out"
"contrib"
];
mesonFlags = [
"-Dman-pages=true"
"-Dversion_override=${version}"
"-Dxwayland=${lib.boolToString withXwayland}"
];
# TODO: investigate why is this happening
postPatch = ''
sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c
'';
postInstall = ''
mkdir -p $contrib/share/cagebreak
cp $src/examples/config $contrib/share/cagebreak/config
install -d $out/share/cagebreak/
install -m644 $src/examples/config $out/share/cagebreak/
'';
postFixup = lib.optionalString withXwayland ''
wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin"
'';
passthru.tests.basic = nixosTests.cagebreak;
meta = with lib; {
description = "A Wayland tiling compositor inspired by ratpoison";
homepage = "https://github.com/project-repo/cagebreak";
description = "A Wayland tiling compositor inspired by ratpoison";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ berbiche ];
platforms = platforms.linux;
};
passthru.tests.basic = nixosTests.cagebreak;
}