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

cross: expand buildInQemu to support a few more packages (e.g. g4music, but i didnt need it in the end)

Browse Source
This commit is contained in:
Colin
2023-08-14 10:23:23 +00:00
parent f8b559bef1
commit dbec4b8f32
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
overlays/cross.nix
View File

@@ -213,17 +213,24 @@ let
# i.e. build using the host's stdenv. # i.e. build using the host's stdenv.
buildOnHost = buildOnHost =
let let
# patch packages which can't ordinarily exist in buildPackages # patch packages which don't expect to be moved to a different platform
preFixPkg = p: preFixPkg = p:
if p.name or null == "make-shell-wrapper-hook" then if p.name or null == "make-shell-wrapper-hook" then
p.overrideAttrs (_: { p.overrideAttrs (_: {
# unconditionally use the outermost targetPackages shell # unconditionally use the outermost targetPackages shell
shell = final.runtimeShell; shell = final.runtimeShell;
}) })
# p.__spliced.buildBuild.overrideAttrs (_: {
# shell = "TODO"; # final.targetPackages.runtimeShell;
# })
# final.makeBinaryWrapper # final.makeBinaryWrapper
else if p.pname or null == "pkg-config-wrapper" then
p.override {
# default pkg-config.__spliced.hostTarget still wants to run on the build machine.
# overriding buildPackages fixes that, and overriding stdenvNoCC makes it be just `pkg-config`, unmangled.
stdenvNoCC = emulated.stdenvNoCC;
buildPackages = final.hostPackages; # TODO: just `final`?
}
# else if p.pname == "wrap-gapps-hook" then
# # avoid faulty propagated gtk3/gtk4
# final.wrapGAppsNoGuiHook
else else
p p
; ;