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

cross compilation: fwupd8: reduce overlapping buildInputs/nativeBuildInputs

Browse Source
This commit is contained in:
Colin 2023-03-07 12:15:18 +00:00
parent 1a639b320d
commit f933581b0c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hosts/common/cross/default.nix
View File

@ -126,6 +126,7 @@ let
depsBuildBuild = upstream.depsBuildBuild or [] ++ depsBuildBuild; depsBuildBuild = upstream.depsBuildBuild or [] ++ depsBuildBuild;
}); });
addNativeInputs = nativeBuildInputs: addInputs { inherit nativeBuildInputs; }; addNativeInputs = nativeBuildInputs: addInputs { inherit nativeBuildInputs; };
addBuildInputs = buildInputs: addInputs { inherit buildInputs; };
mvToNativeInputs = nativeBuildInputs: mvInputs { inherit nativeBuildInputs; }; mvToNativeInputs = nativeBuildInputs: mvInputs { inherit nativeBuildInputs; };
mvToBuildInputs = buildInputs: mvInputs { inherit buildInputs; }; mvToBuildInputs = buildInputs: mvInputs { inherit buildInputs; };
rmInputs = { buildInputs ? [], nativeBuildInputs ? [] }: pkg: pkg.overrideAttrs (upstream: { rmInputs = { buildInputs ? [], nativeBuildInputs ? [] }: pkg: pkg.overrideAttrs (upstream: {
@ -550,11 +551,16 @@ in
# # next.mesonEmulatorHook # # next.mesonEmulatorHook
# # ]; # # ];
# }); # });
fwupd = prev.fwupd.overrideAttrs (orig: { # solves (meson) "Run-time dependency libgcab-1.0 found: NO (tried pkgconfig and cmake)", and others.
# solves (meson) "Run-time dependency libgcab-1.0 found: NO (tried pkgconfig and cmake)", and others. fwupd = (addBuildInputs
buildInputs = orig.buildInputs ++ [ next.gcab next.gnutls ]; [ next.gcab ]
mesonFlags = (lib.remove "-Ddocs=enabled" orig.mesonFlags) ++ [ "-Ddocs=disabled" ]; (mvToBuildInputs [ next.gnutls ] prev.fwupd)
outputs = lib.remove "devdoc" orig.outputs; ).overrideAttrs (upstream: {
# XXX: gcab is apparently needed as both build and native input
# can't build docs w/o adding `gi-docgen` to ldpath, but that adds a new glibc to the ldpath
# which causes host binaries to be linked against the build libc & fail
mesonFlags = (lib.remove "-Ddocs=enabled" upstream.mesonFlags) ++ [ "-Ddocs=disabled" ];
outputs = lib.remove "devdoc" upstream.outputs;
}); });
# fwupd = prev.fwupd.override { # fwupd = prev.fwupd.override {
# # solves missing libgcab-1.0; # # solves missing libgcab-1.0;