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

remove fwupd to reduce cross-compilation patches

This commit is contained in:
Colin 2023-08-04 07:47:00 +00:00
parent 76abbac6f6
commit 22ffcb1b55
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/common/programs/assorted.nix
View File

@ -63,7 +63,7 @@ in
"fatresize"
"fd"
"file"
"fwupd"
# "fwupd"
"gawk"
"git"
"gptfdisk"
@ -120,7 +120,6 @@ in
"dtrx" # `unar` alternative, "Do The Right eXtraction"
"efivar"
# "flashrom"
"fwupd"
"git" # needed as a user package, for config.
# "gnupg"
# "gocryptfs"

19
overlays/cross.nix
View File

@ -326,15 +326,15 @@ in {
# });
# 2023/07/31: upstreaming is unblocked -- if i can rework to not use emulation
fwupd-efi = prev.fwupd-efi.override {
# fwupd-efi queries meson host_machine to decide what arch to build for.
# for some reason, this gives x86_64 unless meson itself is emulated.
# maybe meson's use of "host_machine" actually mirrors nix's "build machine"?
inherit (emulated)
stdenv # fixes: "efi/meson.build:162:0: ERROR: Program or command 'gcc' not found or not executable"
meson # fixes: "efi/meson.build:33:2: ERROR: Problem encountered: gnu-efi support requested, but headers were not found"
;
};
# fwupd-efi = prev.fwupd-efi.override {
# # fwupd-efi queries meson host_machine to decide what arch to build for.
# # for some reason, this gives x86_64 unless meson itself is emulated.
# # maybe meson's use of "host_machine" actually mirrors nix's "build machine"?
# inherit (emulated)
# stdenv # fixes: "efi/meson.build:162:0: ERROR: Program or command 'gcc' not found or not executable"
# meson # fixes: "efi/meson.build:33:2: ERROR: Problem encountered: gnu-efi support requested, but headers were not found"
# ;
# };
# fwupd-efi = prev.fwupd-efi.overrideAttrs (upstream: {
# # does not fix: "efi/meson.build:162:0: ERROR: Program or command 'gcc' not found or not executable"
# makeFlags = upstream.makeFlags or [] ++ [ "CC=${prev.stdenv.cc.targetPrefix}cc" ];
@ -346,7 +346,6 @@ in {
# });
# solves (meson) "Run-time dependency libgcab-1.0 found: NO (tried pkgconfig and cmake)", and others.
# 2023/07/31: upstreaming is blocked on argyllcms, fwupd-efi, libavif
# TODO: can i purge fwupd from my system?
fwupd = (addBuildInputs
[ final.gcab ]
(mvToBuildInputs [ final.gnutls ] prev.fwupd)