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

cross: push dialect patch upstream

Browse Source
This commit is contained in:
Colin
2025-05-02 05:58:15 +00:00
parent 517d12c700
commit 9e199a9f74
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
overlays/cross.nix
View File

@@ -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: <https://github.com/NixOS/nixpkgs/pull/403541>
# 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.
# - <https://mesonbuild.com/Python-module.html#find_installation>
@@ -209,17 +209,17 @@ in with final; {
];
});
# 2025/05/01: upstreaming is unblocked
dialect = prev.dialect.overrideAttrs (upstream: {
# error: "<dialect> is not allowed to refer to the following paths: <build python>"
# 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: <https://github.com/NixOS/nixpkgs/pull/403545>
# dialect = prev.dialect.overrideAttrs (upstream: {
# # error: "<dialect> is not allowed to refer to the following paths: <build python>"
# # 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 {

6
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -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";