about summary refs log tree commit diff
path: root/nixpkgs/pkgs/desktops/mate
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/desktops/mate')
-rw-r--r--nixpkgs/pkgs/desktops/mate/engrampa/default.nix9
-rw-r--r--nixpkgs/pkgs/desktops/mate/libmateweather/default.nix6
2 files changed, 12 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix
index b781251a7ca7..bdac030ed341 100644
--- a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix
+++ b/nixpkgs/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"
   ];
 
diff --git a/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
index 91223601dc4d..5ae845b104f4 100644
--- a/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
@@ -3,6 +3,8 @@
 , fetchurl
 , pkg-config
 , gettext
+, glib
+, libxml2
 , gtk3
 , libsoup
 , tzdata
@@ -18,9 +20,13 @@ stdenv.mkDerivation rec {
     sha256 = "wgCZD0uOnU0OLG99MaWHY3TD0qNsa4y1kEQAQ6hg7zo=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     pkg-config
     gettext
+    glib # glib-compile-schemas
+    libxml2 # xmllint
   ];
 
   buildInputs = [