@@ -9,7 +9,6 @@
99, meson
1010, ninja
1111, nixosTests
12−, pandoc
1312, pango
1413, pixman
1514, pkg-config
@@ -23,20 +22,19 @@
2322
2423stdenv.mkDerivation rec {
2524 pname = "cagebreak";
26− version = "1.7.0";
25+ version = "1.7.1";
2726
2827 src = fetchFromGitHub {
2928 owner = "project-repo";
3029 repo = pname;
3130 rev = version;
32− hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI=";
31+ hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE=";
3332 };
3433
3534 nativeBuildInputs = [
3635 makeWrapper
3736 meson
3837 ninja
39− pandoc
4038 pkg-config
4139 scdoc
4240 wayland
@@ -55,37 +53,33 @@ stdenv.mkDerivation rec {
5553 wlroots
5654 ];
5755
58− outputs = [
59− "out"
60− "contrib"
61− ];
62−
6356 mesonFlags = [
6457 "-Dman-pages=true"
6558 "-Dversion_override=${version}"
6659 "-Dxwayland=${lib.boolToString withXwayland}"
6760 ];
6861
62+ # TODO: investigate why is this happening
6963 postPatch = ''
7064 sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c
7165 '';
7266
7367 postInstall = ''
74− mkdir -p $contrib/share/cagebreak
75− cp $src/examples/config $contrib/share/cagebreak/config
68+ install -d $out/share/cagebreak/
69+ install -m644 $src/examples/config $out/share/cagebreak/
7670 '';
7771
7872 postFixup = lib.optionalString withXwayland ''
7973 wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin"
8074 '';
8175
82− passthru.tests.basic = nixosTests.cagebreak;
83−
8476 meta = with lib; {
85− description = "A Wayland tiling compositor inspired by ratpoison";
8677 homepage = "https://github.com/project-repo/cagebreak";
78+ description = "A Wayland tiling compositor inspired by ratpoison";
8779 license = licenses.mit;
88− platforms = platforms.linux;
8980 maintainers = with maintainers; [ berbiche ];
81+ platforms = platforms.linux;
9082 };
83+
84+ passthru.tests.basic = nixosTests.cagebreak;
9185}