From f3b2a988748046a6f6a903929672127e4390c73f Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 19 Jan 2024 22:05:35 +0000 Subject: [PATCH] firejail: fix cross compilation --- overlays/cross.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/overlays/cross.nix b/overlays/cross.nix index d8c61bd2c..6bd318048 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -653,6 +653,19 @@ in with final; { # }; # }); + firejail = prev.firejail.overrideAttrs (upstream: { + # firejail executes its build outputs to produce the default filter list. + # i think we *could* copy the default filters from pkgsBuildBuild, but that doesn't seem future proof + # for any (future) arch-specific filtering + postPatch = (upstream.postPatch or "") + (let + emulator = stdenv.hostPlatform.emulator buildPackages; + in lib.optionalString (!prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform) '' + substituteInPlace Makefile \ + --replace ' src/fseccomp/fseccomp' ' ${emulator} src/fseccomp/fseccomp' \ + --replace ' src/fsec-optimize/fsec-optimize' ' ${emulator} src/fsec-optimize/fsec-optimize' + ''); + }); + # flare-signal = prev.flare-signal.override { # # fixes "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’" # inherit (emulated) cargo meson rustc rustPlatform stdenv;