From 732c69861400981492bf1159e95e71d845e0b4e0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 7 May 2021 14:34:18 -0300
Subject: [PATCH 1/2] cagebreak: 1.7.0 -> 1.7.1

Now it uses scdoc as manpage generator.
---
 .../window-managers/cagebreak/default.nix     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index de996f080e7..260d94fd80a 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -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
@@ -66,26 +64,27 @@ stdenv.mkDerivation rec {
     "-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 $contrib/share/cagebreak/
+    install -m644 $src/examples/config $contrib/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;
 }

From 9309f19ea26d2824d404c83687f7325e6578aad2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 7 May 2021 14:36:25 -0300
Subject: [PATCH 2/2] cagebreak: merge contrib output with regular output

---
 pkgs/applications/window-managers/cagebreak/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index 260d94fd80a..d88bc0cdbdf 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -53,11 +53,6 @@ stdenv.mkDerivation rec {
     wlroots
   ];
 
-  outputs = [
-    "out"
-    "contrib"
-  ];
-
   mesonFlags = [
     "-Dman-pages=true"
     "-Dversion_override=${version}"
@@ -70,8 +65,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    install -d $contrib/share/cagebreak/
-    install -m644 $src/examples/config $contrib/share/cagebreak/
+    install -d $out/share/cagebreak/
+    install -m644 $src/examples/config $out/share/cagebreak/
   '';
 
   postFixup = lib.optionalString withXwayland ''