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

cross: build libpanel w/o binfmt/qemu

Browse Source
This commit is contained in:
Colin
2023-12-04 07:26:56 +00:00
parent 04af5558b5
commit 991a6a7552
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overlays/cross.nix
View File

@@ -1193,23 +1193,21 @@ in {
# }); # });
# 2023/11/21: upstreaming is blocked by qtsvg (via pipewire/ffado) # 2023/11/21: upstreaming is blocked by qtsvg (via pipewire/ffado)
# libpanel = mvToNativeInputs [ final.glib ] prev.libpanel; libpanel = prev.libpanel.overrideAttrs (upstream: {
# needs binfmt: tries to run the wrong gtk4-update-icon-cache
libpanel = needsBinfmt (prev.libpanel.overrideAttrs (upstream: {
doCheck = false; doCheck = false;
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
# # fixes "Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)" # # fixes "Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)"
# final.pkg-config # final.pkg-config
# ]; # ];
nativeBuildInputs = upstream.nativeBuildInputs ++ [ 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 # it can't figure out where gi-docgen lives
mesonFlags = (upstream.mesonFlags or []) ++ [ mesonFlags = (upstream.mesonFlags or []) ++ [
"-Ddocs=disabled" "-Ddocs=disabled"
]; ];
outputs = lib.remove "devdoc" upstream.outputs; outputs = lib.remove "devdoc" upstream.outputs;
})); });
# libsForQt5 = prev.libsForQt5.overrideScope' (self: super: { # libsForQt5 = prev.libsForQt5.overrideScope' (self: super: {
# qgpgme = super.qgpgme.overrideAttrs (orig: { # qgpgme = super.qgpgme.overrideAttrs (orig: {