From 9a73293bd4394c4b16038652c5de42e3da8982c9 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 6 Mar 2023 21:35:30 +0000 Subject: [PATCH] cross compilation: obex_data_server: reduce emulation --- hosts/common/cross/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index 7889ab3b..779eb09b 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -1076,10 +1076,11 @@ in # ]; # # buildInputs = lib.remove next.gnupg upstream.buildInputs; # }); - obex_data_server = prev.obex_data_server.override { + obex_data_server = prev.obex_data_server.overrideAttrs (upstream: { # fixes "/nix/store/0wk6nr1mryvylf5g5frckjam7g7p9gpi-bash-5.2-p15/bin/bash: line 2: --prefix=ods_manager: command not found" - inherit (emulated) stdenv; - }; + # - dbus-glib incorrectly specified in buildInputs instead of nativeBuildInputs + nativeBuildInputs = upstream.nativeBuildInputs ++ [ next.dbus-glib ]; + }); openfortivpn = prev.openfortivpn.override { # fixes "checking for /proc/net/route... configure: error: cannot check for file existence when cross compiling" inherit (emulated) stdenv;