diff --git a/overlays/cross.nix b/overlays/cross.nix index f95c739c..a76a52f7 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -411,7 +411,7 @@ in with final; { # 2024/05/31: upstreaming is blocked on appstream (out for review), gnome-user-share (apache-httpd, webp-pixbuf-loader), qtsvg # fixes: "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable" - file-roller = mvToNativeInputs [ glib ] super.file-roller; + # file-roller = mvToNativeInputs [ glib ] super.file-roller; # 2024/05/31: upstreaming is blocked by qtsvg, appstream (out for review), libgweather (out for review) geary = super.geary.overrideAttrs (upstream: { @@ -468,15 +468,14 @@ in with final; { gnome-settings-daemon = super.gnome-settings-daemon.overrideAttrs (orig: { # 2024/05/31: upstreaming is blocked on qtsvg (ffado), libgweather # gsd is required by xdg-desktop-portal-gtk - # glib solves: "Program 'glib-mkenums mkenums' not found or not executable" - nativeBuildInputs = orig.nativeBuildInputs ++ [ glib ]; - # pkg-config solves: "plugins/power/meson.build:22:0: ERROR: Dependency lookup for glib-2.0 with method 'pkgconfig' failed: Pkg-config binary for machine 0 not found." + # pkg-config solves: "plugins/power/meson.build:22:0: ERROR: Dependency lookup for glib-2.0 with method 'pkgconfig' failed: Pkg-config binary for machine build machine not found." # stdenv.cc fixes: "plugins/power/meson.build:60:0: ERROR: No build machine compiler for 'plugins/power/gsd-power-enums-update.c'" # but then it fails with a link-time error. # depsBuildBuild = orig.depsBuildBuild or [] ++ [ glib pkg-config buildPackages.stdenv.cc ]; # hack to just not build the power plugin (panel?), to avoid cross compilation errors postPatch = orig.postPatch + '' - sed -i "s/disabled_plugins = \[\]/disabled_plugins = ['power']/" plugins/meson.build + substituteInPlace plugins/meson.build \ + --replace-fail "disabled_plugins = []" "disabled_plugins = ['power']" ''; }); @@ -773,7 +772,8 @@ in with final; { # fixes: "ar: command not found" # `ar` is provided by bintools # 2024/05/31: upstreaming is unblocked by deps; but turns out to not be this simple - ncftp = addNativeInputs [ bintools ] prev.ncftp; + # ncftp = addNativeInputs [ bintools ] prev.ncftp; + # fixes "gdbus-codegen: command not found" # 2023/07/31: upstreaming is blocked on p11-kit, openfortivpn, qttranslations (qtbase) cross compilation # networkmanager-fortisslvpn = mvToNativeInputs [ glib ] prev.networkmanager-fortisslvpn; @@ -1147,7 +1147,8 @@ in with final; { # fixes: "ar: command not found" # `ar` is provided by bintools # 2024/05/31: upstreaming is blocked on gnustep-base cross compilation - unar = addNativeInputs [ bintools ] prev.unar; + # unar = addNativeInputs [ bintools ] prev.unar; + # unixODBCDrivers = prev.unixODBCDrivers // { # # TODO: should this package be deduped with toplevel psqlodbc in upstream nixpkgs? # psql = prev.unixODBCDrivers.psql.overrideAttrs (_upstream: { @@ -1210,14 +1211,15 @@ in with final; { # fixes "No package 'xdg-desktop-portal' found" # 2023/12/08: upstreaming is blocked on argyllcms, flatpak, qtsvg (via pipewire/ffado) xdg-desktop-portal-gtk = mvToBuildInputs [ xdg-desktop-portal ] prev.xdg-desktop-portal-gtk; + # fixes: "data/meson.build:33:5: ERROR: Program 'msgfmt' not found or not executable" # fixes: "src/meson.build:25:0: ERROR: Program 'gdbus-codegen' not found or not executable" # 2023/07/27: upstreaming is blocked on p11-kit cross compilation - xdg-desktop-portal-gnome = ( - addNativeInputs [ wayland-scanner ] ( - mvToNativeInputs [ gettext glib ] prev.xdg-desktop-portal-gnome - ) - ); + # xdg-desktop-portal-gnome = ( + # addNativeInputs [ wayland-scanner ] ( + # mvToNativeInputs [ gettext glib ] prev.xdg-desktop-portal-gnome + # ) + # ); # 2024/02/27: upstreaming is blocked on hyprland # waybar = (prev.waybar.override { @@ -1290,6 +1292,6 @@ in with final; { # upstream.postBuild; # }); - # 2023/07/30: upstreaming is blocked on unar (gnustep), unless i also make that optional + # 2024/05/31: upstreaming is blocked on unar (gnustep), unless i also make that optional xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; }