From 368099e95ab51c77658deb443617c005cb7e7bb6 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 8 Dec 2023 15:00:29 +0000 Subject: [PATCH] cross: ostree: apply Mindavi's PR feedback --- overlays/cross.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index ad391bc9..b869a997 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -1663,10 +1663,13 @@ in with final; { # nativeBuildInputs = upstream.nativeBuildInputs ++ [ gpgme ]; # buildInputs = lib.remove gjs upstream.buildInputs; # configureFlags = lib.remove "--enable-installed-tests" upstream.configureFlags; - postPatch = (upstream.postPatch or "") + '' - substituteInPlace Makefile-libostree.am \ - --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" - ''; + # postPatch = (upstream.postPatch or "") + '' + # substituteInPlace Makefile-libostree.am \ + # --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" + # ''; + makeFlags = upstream.makeFlags ++ [ + "INTROSPECTION_SCANNER_ENV=" + ]; }); # fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"