diff --git a/overlays/cross.nix b/overlays/cross.nix index eee3f34d0..be6ff2cfb 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -124,7 +124,7 @@ let }; in with final; { # bamf: required via pantheon.switchboard -> wingpanel -> gala - # 2025/05/01: upstreaming is unblocked + # 2025/05/01: upstreaming is unblocked, out for PR: # bamf = prev.bamf.overrideAttrs (upstream: { # # "You must have gtk-doc >= 1.0 installed to build documentation" # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ @@ -181,7 +181,7 @@ in with final; { # }; - # 2025/02/04: upstreaming is unblocked, but a cleaner solution than this doesn't seem to exist yet + # 2025/05/01: upstreaming is unblocked, but a cleaner solution than this doesn't seem to exist yet confy = prev.confy.overrideAttrs (upstream: { # meson's `python.find_installation` method somehow just doesn't support cross compilation. # - @@ -209,17 +209,17 @@ in with final; { ]; }); - # 2025/05/01: upstreaming is unblocked - dialect = prev.dialect.overrideAttrs (upstream: { - # error: " is not allowed to refer to the following paths: " - # dialect's meson build script sets host binaries to use build PYTHON - # disallowedReferences = []; - postFixup = (upstream.postFixup or "") + '' - patchShebangs --update --host $out/share/dialect/search_provider - ''; - # upstream sets strictDeps=false which makes gAppsWrapperHook wrap with the build dependencies - strictDeps = true; - }); + # 2025/05/01: upstreaming is unblocked, out for PR: + # dialect = prev.dialect.overrideAttrs (upstream: { + # # error: " is not allowed to refer to the following paths: " + # # dialect's meson build script sets host binaries to use build PYTHON + # # disallowedReferences = []; + # postFixup = (upstream.postFixup or "") + '' + # patchShebangs --update --host $out/share/dialect/search_provider + # ''; + # # upstream sets strictDeps=false which makes gAppsWrapperHook wrap with the build dependencies + # strictDeps = true; + # }); # 2025/05/01: upstreaming is unblocked # dtrx = prev.dtrx.override { diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index 8c899cd85..725b06435 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -36,6 +36,12 @@ in hash = "sha256-9maM1MuoI/4oW55m0jBk54PVeNFAAGYcZPVvuxtKEJQ="; }) + (fetchpatch' { + name = "dialect: fix cross compilation"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/403545"; + hash = "sha256-KLKzKRGkCmfO8JLxmg0WKGM49QqgvJrgGJAX8I+C3KM="; + }) + (fetchpatch' { name = "fcitx5: fix cross compilation"; prUrl = "https://github.com/NixOS/nixpkgs/pull/399981";