colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

firejail: fix cross compilation

Browse Source
This commit is contained in:
Colin
2024-01-19 22:05:35 +00:00
parent 2e9084c9ef
commit f3b2a98874
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
overlays/cross.nix
View File

@@ -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 { # flare-signal = prev.flare-signal.override {
# # fixes "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’" # # fixes "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’"
# inherit (emulated) cargo meson rustc rustPlatform stdenv; # inherit (emulated) cargo meson rustc rustPlatform stdenv;