From aa92e6114b5934c752d0db98c9cbbf72bb5495a4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 19 Jan 2023 09:57:23 +0800 Subject: gtk-layer-shell: fix cross compilation --- .../libraries/gtk-layer-shell/default.nix | 27 +++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/gtk-layer-shell') diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 92a126bd7e8..1c946ec3467 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, wayland-scanner , wayland , gtk3 , gobject-introspection @@ -26,6 +29,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; }; + patches = [ + # https://github.com/wmww/gtk-layer-shell/pull/146 + # Mark wayland-scanner as a build-time dependency + (fetchpatch { + url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch"; + hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM="; + }) + # https://github.com/wmww/gtk-layer-shell/pull/147 + # Remove redundant dependency check for gtk-doc + (fetchpatch { + url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch"; + hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs="; + }) + ]; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -35,6 +59,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 vala + wayland-scanner ]; buildInputs = [ -- cgit 1.4.1