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

fcitx5,xcb-imdkit: push cross fixes upstream

Browse Source
This commit is contained in:
Colin
2025-04-19 20:35:09 +00:00
parent be2d34d869
commit 8782b529fd
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
overlays/cross.nix
View File

@@ -272,15 +272,16 @@ in with final; {
# extra-cmake-modules = buildPackages.extra-cmake-modules; # extra-cmake-modules = buildPackages.extra-cmake-modules;
fcitx5 = prev.fcitx5.overrideAttrs (upstream: { # out for PR: <https://github.com/NixOS/nixpkgs/pull/399981>
# TODO: CMake probably has some emulator, or cross compiler infra to use here? # fcitx5 = prev.fcitx5.overrideAttrs (upstream: {
postPatch = (upstream.postPatch or "") + '' # # TODO: CMake probably has some emulator, or cross compiler infra to use here?
substituteInPlace src/modules/spell/CMakeLists.txt \ # postPatch = (upstream.postPatch or "") + ''
--replace-fail 'COMMAND Fcitx5::comp-spell-dict' 'COMMAND ${stdenv.hostPlatform.emulator buildPackages} comp-spell-dict' # substituteInPlace src/modules/spell/CMakeLists.txt \
''; # --replace-fail 'COMMAND Fcitx5::comp-spell-dict' 'COMMAND ${stdenv.hostPlatform.emulator buildPackages} comp-spell-dict'
# '';
buildInputs = lib.filter (p: p.name != extra-cmake-modules.name) upstream.buildInputs; # buildInputs = lib.filter (p: p.name != extra-cmake-modules.name) upstream.buildInputs;
}); # });
# 2025/01/25: upstreaming is unblocked # 2025/01/25: upstreaming is unblocked
# firejail = prev.firejail.overrideAttrs (upstream: { # firejail = prev.firejail.overrideAttrs (upstream: {
@@ -950,10 +951,11 @@ in with final; {
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
# 2025/04/17: upstreaming is unblocked # 2025/04/17: upstreaming is unblocked
xcb-imdkit = prev.xcb-imdkit.overrideAttrs (upstream: { # out for PR: <https://github.com/NixOS/nixpkgs/pull/399981>
buildInputs = lib.filter (p: p.name != extra-cmake-modules.name) upstream.buildInputs; # xcb-imdkit = prev.xcb-imdkit.overrideAttrs (upstream: {
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [ # buildInputs = lib.filter (p: p.name != extra-cmake-modules.name) upstream.buildInputs;
buildPackages.extra-cmake-modules # nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
]; # buildPackages.extra-cmake-modules
}); # ];
# });
} }

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

@@ -30,14 +30,19 @@ let
in in
[ [
(fetchpatch' { (fetchpatch' {
# TODO: push upstream name = "fcitx5: fix cross compilation";
name = "git: fix cross compilation"; prUrl = "https://github.com/NixOS/nixpkgs/pull/399981";
saneCommit = "a39adc945ec4f157bc695ef8ecd1e95579f01afa"; hash = "sha256-BSnp80+8cpb+1yFaB0g7ZnPgQQqC7qo+ReMJUtlKgr4=";
hash = "sha256-OxUx3KgR0NstFfuobb3LxWFYwY0DUrYqiVFifS+sYr8=";
}) })
(fetchpatch' { (fetchpatch' {
# TODO: approve after testing name = "git: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/399955";
hash = "sha256-UsVH6NhHIEoipi9fzl89mZolo/Lo1l0dos7trOGdU9A=";
})
(fetchpatch' {
# fixes build
name = "sm64coopdx: 1.2.1 -> 1.3.0"; name = "sm64coopdx: 1.2.1 -> 1.3.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/399415"; prUrl = "https://github.com/NixOS/nixpkgs/pull/399415";
hash = "sha256-ExoGrUlZKBNeHyor22D/mi5cQrgbCxapcSdDE5o6Ow8="; hash = "sha256-ExoGrUlZKBNeHyor22D/mi5cQrgbCxapcSdDE5o6Ow8=";