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

cross: build mepo without emulating as many packages

Browse Source
This commit is contained in:
Colin 2023-08-05 00:38:37 +00:00
parent 169354bd33
commit 2685c91dd9
1 changed files with 82 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
overlays/cross.nix
View File

@ -739,18 +739,88 @@ in {
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ]; # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ];
}); });
mepo = (prev.mepo.override { mepo =
# emulate zig and stdenv to fix: # let
# - "/build/source/src/sdlshim.zig:1:20: error: C import failed" # zig = final.zig.override {
# emulate makeWrapper to fix: # inherit (emulated) stdenv;
# - "error: makeWrapper/makeShellWrapper must be in nativeBuildInputs" # };
inherit (emulated) makeWrapper stdenv zig; # # makeWrapper = final.makeWrapper.override {
}).overrideAttrs (upstream: { # # inherit (emulated) stdenv;
nativeBuildInputs = [ final.pkg-config emulated.makeWrapper ]; # # };
# ref to zig by full path because otherwise it doesn't end up on the path... # # makeWrapper = emulated.stdenv.mkDerivation final.makeWrapper;
checkPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.checkPhase; # in
installPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.installPhase; # (prev.mepo.overrideAttrs (upstream: {
}); # checkPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.checkPhase;
# installPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.installPhase;
# })).override {
# inherit (emulated) stdenv;
# inherit zig;
# };
final.callPackage ({
stdenv
, upstreamMepo
, makeWrapper
, pkg-config
, zig
# buildInputs
, curl
, SDL2
, SDL2_gfx
, SDL2_image
, SDL2_ttf
, jq
, ncurses
}: stdenv.mkDerivation {
inherit (upstreamMepo)
pname
version
src
# buildInputs
preBuild
doCheck
postInstall
meta
;
# moves pkg-config to buildInputs where zig can see it, and uses the host build of zig.
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
curl SDL2 SDL2_gfx SDL2_image SDL2_ttf jq ncurses pkg-config
];
checkPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstreamMepo.checkPhase;
installPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstreamMepo.installPhase;
}) {
upstreamMepo = prev.mepo;
inherit (emulated) stdenv;
zig = useEmulatedStdenv final.zig;
};
# (prev.mepo.override {
# # emulate zig and stdenv to fix:
# # - "/build/source/src/sdlshim.zig:1:20: error: C import failed"
# # emulate makeWrapper to fix:
# # - "error: makeWrapper/makeShellWrapper must be in nativeBuildInputs"
# # inherit (emulated) makeWrapper stdenv;
# inherit (emulated) stdenv;
# inherit zig;
# # inherit makeWrapper;
# }).overrideAttrs (upstream: {
# # nativeBuildInputs = [ final.pkg-config makeWrapper ];
# # nativeBuildInputs = [ final.pkg-config emulated.makeWrapper ];
# # ref to zig by full path because otherwise it doesn't end up on the path...
# #checkPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.checkPhase;
# #installPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.installPhase;
# });
# mepo = (prev.mepo.override {
# # emulate zig and stdenv to fix:
# # - "/build/source/src/sdlshim.zig:1:20: error: C import failed"
# # emulate makeWrapper to fix:
# # - "error: makeWrapper/makeShellWrapper must be in nativeBuildInputs"
# inherit (emulated) makeWrapper stdenv zig;
# }).overrideAttrs (upstream: {
# nativeBuildInputs = [ final.pkg-config emulated.makeWrapper ];
# # ref to zig by full path because otherwise it doesn't end up on the path...
# checkPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.checkPhase;
# installPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.installPhase;
# });
# mepo = (prev.mepo.override { # mepo = (prev.mepo.override {
# inherit (emulated) stdenv; # inherit (emulated) stdenv;
# }).overrideAttrs (upstream: { # }).overrideAttrs (upstream: {