From 408a6b0c1d5c309511795a2950533bd7da0448e8 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 7 Aug 2023 02:32:13 +0000 Subject: [PATCH] mate.engrampa: support cross compilation --- pkgs/desktops/mate/engrampa/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index b781251a7ca7..bdac030ed341 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -6,11 +6,12 @@ , itstool , libxml2 , gtk3 -, file , mate , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript +# can be defaulted to true once engrampa builds with meson (version > 1.27.0) +, withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, file }: stdenv.mkDerivation rec { @@ -26,20 +27,22 @@ stdenv.mkDerivation rec { pkg-config gettext itstool + libxml2 # for xmllint wrapGAppsHook ]; buildInputs = [ - libxml2 gtk3 - file #libmagic mate.caja hicolor-icon-theme mate.mate-desktop + ] ++ lib.optionals withMagic [ + file ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" + ] ++ lib.optionals withMagic [ "--enable-magic" ];