From c5e7eff560302b7bf047c5f2a5d4fa184c694fae Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 3 May 2021 21:29:01 +0200 Subject: [PATCH 1/3] wlogout: support cross-compilation --- pkgs/tools/wayland/wlogout/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index d9d44212601..c7364af5d5f 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs="; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ gtk3 From 772502c35843f8e8e7610dc63e1b7384f6f5072c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 23 Nov 2021 19:59:04 +0100 Subject: [PATCH 2/3] wlogout: disable gtk-layer-shell when cross-compiling Because gtk-layer-shell doesn't cross-compile properly --- pkgs/tools/wayland/wlogout/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index c7364af5d5f..26d04bd11e0 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -10,6 +10,11 @@ , wayland , wayland-protocols , gtk-layer-shell +# gtk-layer-shell fails to cross-compile due to a hard dependency +# on gobject-introspection. +# Disable it when cross-compiling since it's an optional dependency. +# This disables transparency support. +, withGtkLayerShell ? (stdenv.buildPlatform == stdenv.hostPlatform) }: stdenv.mkDerivation rec { @@ -30,6 +35,7 @@ stdenv.mkDerivation rec { libxkbcommon wayland wayland-protocols + ] ++ lib.optionals withGtkLayerShell [ gtk-layer-shell ]; From 4ff62d90ac452024e8fe2c422e7c9f12438abdc4 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 5 May 2022 22:55:47 +0200 Subject: [PATCH 3/3] wlogout: enable strictDeps --- pkgs/tools/wayland/wlogout/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index 26d04bd11e0..7f9935b6c3c 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs="; }; + strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [