From bb2745a49fb9c030c4d6dba95beac5b445333d67 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 25 Jun 2021 19:07:19 +0200 Subject: [PATCH] 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;