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

fractal: annotate crates which require binfmt for cross compilation

Browse Source
This commit is contained in:
Colin 2023-11-30 01:36:53 +00:00
parent 36c7f77a98
commit ed1bf899b6
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
overlays/cross.nix
View File

@ -630,7 +630,38 @@ in {
# });
# needs binfmt: "error[E0463]: can't find crate for `gettextrs`"
fractal-nixified = needsBinfmt prev.fractal-nixified;
fractal-nixified = needsBinfmt (prev.fractal-nixified.override {
# TODO: lift this to the toplevel?
defaultCrateOverrides = let
crateNeedsBinfmt = cname: {
"${cname}" = attrs: let
baseAttrs = (final.defaultCrateOverrides."${cname}" or (a: a)) attrs;
in baseAttrs // {
requiredSystemFeatures = (baseAttrs.requiredSystemFeatures or []) ++ [ "kvm" ];
};
};
in final.defaultCrateOverrides
// (crateNeedsBinfmt "gdk4")
// (crateNeedsBinfmt "gsk4")
// (crateNeedsBinfmt "gst-plugin-gtk4")
// (crateNeedsBinfmt "gstreamer")
// (crateNeedsBinfmt "gstreamer-audio")
// (crateNeedsBinfmt "gstreamer-audio-sys")
// (crateNeedsBinfmt "gstreamer-base")
// (crateNeedsBinfmt "gstreamer-base-sys")
// (crateNeedsBinfmt "gstreamer-pbutils")
// (crateNeedsBinfmt "gstreamer-pbutils-sys")
// (crateNeedsBinfmt "gstreamer-play")
// (crateNeedsBinfmt "gstreamer-play-sys")
// (crateNeedsBinfmt "gstreamer-sys")
// (crateNeedsBinfmt "gstreamer-video")
// (crateNeedsBinfmt "gstreamer-video-sys")
// (crateNeedsBinfmt "gtk4")
// (crateNeedsBinfmt "libadwaita")
// (crateNeedsBinfmt "libshumate")
// (crateNeedsBinfmt "sourceview5")
;
});
# 2023/07/31: upstreaming is unblocked -- if i can rework to not use emulation
# fwupd-efi = prev.fwupd-efi.override {

10
pkgs/additional/fractal-nixified/default.nix
View File

@ -24,6 +24,7 @@
, appstream-glib
, buildPackages
, cargo
, defaultCrateOverrides
, desktop-file-utils
, fetchFromGitHub
, gdk-pixbuf
@ -328,7 +329,10 @@ let
};
};
defaultCrateOverrides = pkgs.defaultCrateOverrides // extraCrateOverrides;
defaultCrateOverrides' = defaultCrateOverrides // (lib.mapAttrs (crate: fn:
# map each `extraCrateOverrides` to first pass their attrs through `defaultCrateOverrides`
attrs: fn ((defaultCrateOverrides."${crate}" or (a: a)) attrs)
) extraCrateOverrides);
crate2NixOverrides = crates: crates // {
# crate2nix sometimes "misses" dependencies, or gets them wrong in a way that crateOverrides can't patch.
@ -355,7 +359,7 @@ let
inherit pkgs;
release = false;
rootFeatures = [ ]; #< avoids --cfg feature="default", simplifying the rustc CLI so that i can pass it around easier
inherit defaultCrateOverrides;
defaultCrateOverrides = defaultCrateOverrides';
};
# fractalDefault = cargoNix.workspaceMembers.fractal.build;
@ -363,7 +367,7 @@ let
packageId = "fractal";
features = [];
buildRustCrateForPkgsFunc = pkgs: crateArgs: (pkgs.buildRustCrate.override {
inherit defaultCrateOverrides;
defaultCrateOverrides = defaultCrateOverrides';
}) (crateArgs // {
# this can be used to force a rebuild of every crate
# mostly useful to deal with impurities (i.e. binfmt when cross-compiling)