cross: build libpanel w/o binfmt/qemu
This commit is contained in:
parent
04af5558b5
commit
991a6a7552
|
@ -1193,23 +1193,21 @@ in {
|
|||
# });
|
||||
|
||||
# 2023/11/21: upstreaming is blocked by qtsvg (via pipewire/ffado)
|
||||
# libpanel = mvToNativeInputs [ final.glib ] prev.libpanel;
|
||||
# needs binfmt: tries to run the wrong gtk4-update-icon-cache
|
||||
libpanel = needsBinfmt (prev.libpanel.overrideAttrs (upstream: {
|
||||
libpanel = prev.libpanel.overrideAttrs (upstream: {
|
||||
doCheck = false;
|
||||
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
|
||||
# # fixes "Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)"
|
||||
# final.pkg-config
|
||||
# ];
|
||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||
(lib.getBin final.gtk4) # fixes "ERROR: Program 'gtk-update-icon-cache' not found or not executable"
|
||||
final.buildPackages.gtk4 # fixes "ERROR: Program 'gtk-update-icon-cache' not found or not executable"
|
||||
];
|
||||
# it can't figure out where gi-docgen lives
|
||||
mesonFlags = (upstream.mesonFlags or []) ++ [
|
||||
"-Ddocs=disabled"
|
||||
];
|
||||
outputs = lib.remove "devdoc" upstream.outputs;
|
||||
}));
|
||||
});
|
||||
|
||||
# libsForQt5 = prev.libsForQt5.overrideScope' (self: super: {
|
||||
# qgpgme = super.qgpgme.overrideAttrs (orig: {
|
||||
|
|
Loading…
Reference in New Issue
Block a user