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

overlays/cross: sync upstreaming status

Browse Source
This commit is contained in:
Colin
2024-05-13 16:47:16 +00:00
parent 9d51b2ecc7
commit 3d2babf2bb
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
overlays/cross.nix
View File

@@ -387,7 +387,7 @@ in with final; {
# }); # });
# }; # };
# 2024/02/27: upstreaming is unblocked # 2024/05/13: upstreaming is unblocked; out for review: <https://github.com/NixOS/nixpkgs/pull/305241>
appstream = prev.appstream.overrideAttrs (upstream: { appstream = prev.appstream.overrideAttrs (upstream: {
# fixes: "Message: Native appstream required for cross-building" # fixes: "Message: Native appstream required for cross-building"
# error introduced in: # error introduced in:
@@ -815,11 +815,12 @@ in with final; {
}); });
# 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig". # 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig".
# 2024/05/13: upstreaming is bloked by dbus-python (fixed in staging), appstream (out for PR)
gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts; gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
gnome = prev.gnome.overrideScope (self: super: { gnome = prev.gnome.overrideScope (self: super: {
evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: { evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: {
# 2023/12/08: upstreaming is unblocked, but depends on webkitgtk 4.1 # 2024/05/13: upstreaming is blocked by appstream (out for PR), libgweather (out for PR)
cmakeFlags = upstream.cmakeFlags ++ [ cmakeFlags = upstream.cmakeFlags ++ [
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
"-DENABLE_TESTS=no" "-DENABLE_TESTS=no"
@@ -2073,12 +2074,12 @@ in with final; {
# 2024/02/29: upstreaming is blocked on libei (unless Xwayland config option is disabled in nixpkgs) # 2024/02/29: upstreaming is blocked on libei (unless Xwayland config option is disabled in nixpkgs)
# out for PR: <https://github.com/NixOS/nixpkgs/pull/292415> # out for PR: <https://github.com/NixOS/nixpkgs/pull/292415>
wlroots = prev.wlroots.overrideAttrs (upstream: { # wlroots = prev.wlroots.overrideAttrs (upstream: {
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [ # nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
# incorrectly specified as `buildInputs` in nixpkgs. # # incorrectly specified as `buildInputs` in nixpkgs.
hwdata # hwdata
]; # ];
}); # });
# wrapFirefox = prev.wrapFirefox.override { # wrapFirefox = prev.wrapFirefox.override {
# buildPackages = buildPackages // { # buildPackages = buildPackages // {
@@ -2092,6 +2093,7 @@ in with final; {
# }; # };
# }; # };
# fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o)
wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: { wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: {
# nvim wrapper has a sanity check that the plugins will load correctly. # nvim wrapper has a sanity check that the plugins will load correctly.
# this is effectively a check phase and should be rewritten as such # this is effectively a check phase and should be rewritten as such