From bb2745a49fb9c030c4d6dba95beac5b445333d67 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 Jun 2021 19:07:19 +0200
Subject: [PATCH 1/2] wio: Build with wlroots 0.14

Fetching that patch from yet another source (my fork) isn't ideal but I
didn't get a response since I sent my patch to the other maintainer.
IMO we should (eventually) drop this package as there isn't an official
fork yet.
---
 pkgs/applications/window-managers/wio/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix                   | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix
index 485fd0b8a623..0f7402b3710c 100644
--- a/pkgs/applications/window-managers/wio/default.nix
+++ b/pkgs/applications/window-managers/wio/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromBitbucket
+, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-mCggAscQ+Ej3SNwhA6QxecV1nH6Rw8RDf8yAsbadqjE=";
   };
 
+  patches = [
+    # Fix the build with wlroots 0.14:
+    (fetchpatch {
+      url = "https://git.sr.ht/~primeos/wio/commit/9d5093c019f6966b8ee0dba1da3361a761d04bcc.patch";
+      sha256 = "08hfmcs1fbz8pdxwcaidrhvydf19482i6wics75a41ilrdh0dpi1";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aea5f7d3a57d..6705c5b90e07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27653,9 +27653,7 @@ in
 
   weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
 
-  wio = callPackage ../applications/window-managers/wio {
-    wlroots = wlroots_0_13;
-  };
+  wio = callPackage ../applications/window-managers/wio { };
 
   whitebox-tools = callPackage ../applications/gis/whitebox-tools {
     inherit (darwin.apple_sdk.frameworks) Security;

From da5f8ac977b86bb5e12e3d98af6cf3c2337d524b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 26 Jun 2021 18:23:20 +0200
Subject: [PATCH 2/2] wlroots_0_13: drop

We've now updated or patched all packages to use wlroots 0.14 (except
phoc which still depends on wlroots 0.12).
---
 pkgs/development/libraries/wlroots/0.13.nix | 55 ---------------------
 pkgs/top-level/all-packages.nix             |  1 -
 2 files changed, 56 deletions(-)
 delete mode 100644 pkgs/development/libraries/wlroots/0.13.nix

diff --git a/pkgs/development/libraries/wlroots/0.13.nix b/pkgs/development/libraries/wlroots/0.13.nix
deleted file mode 100644
index f2343e73c589..000000000000
--- a/pkgs/development/libraries/wlroots/0.13.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
-, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
-, libpng, ffmpeg, libuuid, xcbutilrenderutil, xwayland
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wlroots";
-  version = "0.13.0";
-
-  src = fetchFromGitHub {
-    owner = "swaywm";
-    repo = "wlroots";
-    rev = version;
-    sha256 = "01plhbnsp5yg18arz0v8fr0pr9l4w4pdzwkg9px486qdvb3s1vgy";
-  };
-
-  # $out for the library and $examples for the example programs (in examples):
-  outputs = [ "out" "examples" ];
-
-  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
-
-  buildInputs = [
-    libGL wayland wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
-    libpng ffmpeg libuuid xcbutilrenderutil xwayland
-  ];
-
-  mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
-
-  postFixup = ''
-    # Install ALL example programs to $examples:
-    # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
-    # screenshot output-layout multi-pointer rotation tablet touch pointer
-    # simple
-    mkdir -p $examples/bin
-    cd ./examples
-    for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
-      cp "$binary" "$examples/bin/wlroots-$binary"
-    done
-  '';
-
-  meta = with lib; {
-    description = "A modular Wayland compositor library";
-    longDescription = ''
-      Pluggable, composable, unopinionated modules for building a Wayland
-      compositor; or about 50,000 lines of code you were going to write anyway.
-    '';
-    inherit (src.meta) homepage;
-    changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}";
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ primeos synthetica ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6705c5b90e07..438075f7f14a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24575,7 +24575,6 @@ in
   };
 
   wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
-  wlroots_0_13 = callPackage ../development/libraries/wlroots/0.13.nix {};
 
   sway-unwrapped = callPackage ../applications/window-managers/sway { };
   sway = callPackage ../applications/window-managers/sway/wrapper.nix { };