From f8ab8b290ebbf8ce1be6fa7ee3dd9ccd1b5543c8 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 22 Feb 2023 09:03:15 +0000
Subject: [PATCH] cross compilation: don't emulate `file-roller`

---
 hosts/common/cross.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/hosts/common/cross.nix b/hosts/common/cross.nix
index aeddf0be..84137382 100644
--- a/hosts/common/cross.nix
+++ b/hosts/common/cross.nix
@@ -455,10 +455,14 @@ in
             #   # doesn't fix "CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately"
             #   nativeBuildInputs = orig.nativeBuildInputs ++ [ next.perl ];
             # });
-            file-roller = super.file-roller.override {
-              # fixes "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
-              inherit (emulated) stdenv;
-            };
+            # file-roller = super.file-roller.override {
+            #   # fixes "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
+            #   inherit (emulated) stdenv;
+            # };
+            file-roller = super.file-roller.overrideAttrs (orig: {
+              # fixes: "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
+              nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];
+            });
             gnome-color-manager = super.gnome-color-manager.overrideAttrs (orig: {
               # fixes: "src/meson.build:3:0: ERROR: Program 'glib-compile-resources' not found or not executable"
               nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];