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

nixpkgs: 0-unstable-2025-04-13 -> 0-unstable-2025-04-18

Browse Source
This commit is contained in:
Colin
2025-04-19 04:32:14 +00:00
parent 920b277a93
commit 1d4191c838
5 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
overlays/cross.nix
View File

@@ -53,6 +53,7 @@ let
buildInputs = lib.subtractLists buildInputs (upstream.buildInputs or []);
nativeBuildInputs = lib.subtractLists nativeBuildInputs (upstream.nativeBuildInputs or []);
});
rmBuildInputs = buildInputs: rmInputs { inherit buildInputs; };
rmNativeInputs = nativeBuildInputs: rmInputs { inherit nativeBuildInputs; };
# move items from buildInputs into nativeBuildInputs, or vice-versa.
# arguments represent the final location of specific inputs.
@@ -271,6 +272,16 @@ in with final; {
# extra-cmake-modules = buildPackages.extra-cmake-modules;
fcitx5 = prev.fcitx5.overrideAttrs (upstream: {
# TODO: CMake probably has some emulator, or cross compiler infra to use here?
postPatch = (upstream.postPatch or "") + ''
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;
});
# 2025/01/25: upstreaming is unblocked
# firejail = prev.firejail.overrideAttrs (upstream: {
# # firejail executes its build outputs to produce the default filter list.
@@ -784,16 +795,6 @@ in with final; {
# });
# });
# 2025/03/24: xcb-imdkit is only needed on x11.
# it breaks because of a dependency on extra-cmake-modules, which pulls in conflicting `qtsvg`.
# path to upstreaming is to remove extra-cmake-modules' dependency on qtsvg.
# it's only there because of `wrapQtAppsHook`, which is a noop when building extra-cmake-modules,
# but the qt5 nixpkgs stuff is a dumpster fire so have fun with that...
rofi-unwrapped = prev.rofi-unwrapped.override {
xcb-imdkit = null;
};
# 2025/04/04: upstreaming is blocked on glycin-loaders
snapshot = prev.snapshot.override {
# fixes "error: linker `cc` not found"
@@ -948,14 +949,11 @@ in with final; {
# 2025/04/04: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
# 2025/04/04: upstreaming is unblocked, but proper fix is more involved:
# can't disable the `installedTests` output by reading `finalAttrs.doCheck` because infinite recursion;
# working fix is either to fix test building (not running) to work under cross, or give the package an ugly
# `installCheck` call arg & gate things there.
xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [
buildPackages.glib # for gdbus-codegen
# 2025/04/17: upstreaming is unblocked
xcb-imdkit = prev.xcb-imdkit.overrideAttrs (upstream: {
buildInputs = lib.filter (p: p.name != extra-cmake-modules.name) upstream.buildInputs;
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
buildPackages.extra-cmake-modules
];
outputs = [ "out" ]; #< no installedTests
});
}