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

upstream some cross compilation fixes; remove patches which are no longer necessary

Browse Source
This commit is contained in:
Colin
2025-03-17 01:28:16 +00:00
parent 04328e7f2a
commit 7ee91765fc
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
overlays/cross.nix
View File

@@ -330,21 +330,6 @@ in with final; {
]; ];
}; };
# 2025/02/08: upstreaming is unblocked
flatpak = prev.flatpak.overrideAttrs (upstream: {
outputs = lib.remove "devdoc" upstream.outputs;
depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
pkgsBuildBuild.pkg-config
];
nativeBuildInputs = upstream.nativeBuildInputs ++ [
gtk-doc
pkgsBuildHost.wayland-scanner
];
mesonFlags = upstream.mesonFlags ++ [
"-Dgtkdoc=disabled"
];
});
# 2025/01/13: upstreaming is blocked by glycin-loaders # 2025/01/13: upstreaming is blocked by glycin-loaders
fractal = prev.fractal.override { fractal = prev.fractal.override {
cargo = crossCargo; cargo = crossCargo;
@@ -891,12 +876,6 @@ in with final; {
''; '';
}); });
# 2025/01/19: upstreaming is unblocked
tree-sitter = prev.tree-sitter.overrideAttrs (upstream: {
# shell completions were enabled, but aren't cross-compatible: <https://github.com/nixos/nixpkgs/pull/368976>
postInstall = lib.replaceStrings [ "installShellCompletion" ] [ "true || installShellCompletion" ] upstream.postInstall;
});
# fixes: "ar: command not found" # fixes: "ar: command not found"
# `ar` is provided by bintools # `ar` is provided by bintools
# 2024/05/31: upstreaming is blocked on gnustep-base cross compilation # 2024/05/31: upstreaming is blocked on gnustep-base cross compilation
@@ -962,12 +941,6 @@ in with final; {
# upstream.postBuild; # upstream.postBuild;
# }); # });
wvkbd = prev.wvkbd.overrideAttrs (upstream: {
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
buildPackages.scdoc
];
});
# 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional # 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;

4
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "44588aa5476450605bb2cee95b9fd93f20d38697"; rev = "5d9b5431f967007b3952c057fc92af49a4c5f3b2";
sha256 = "sha256-ZXEJAKsuFg9NO/X7z3jxUtQ+gdUHihjEo24W0V1RYF0="; sha256 = "sha256-nkH2Edu9rClcsQp2PYBe8E6fp8LDPi2uDBQ6wyMdeXI=";
version = "0-unstable-2025-03-16"; version = "0-unstable-2025-03-16";
branch = "master"; branch = "master";
} }