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

cross: fix xarchiver by fetching patch from upstream PR instead of with overlay

Browse Source
This commit is contained in:
Colin
2025-05-12 23:14:12 +00:00
parent 7d8fbf64dc
commit c0878f1717
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overlays/cross.nix
View File

@@ -767,6 +767,6 @@ in with final; {
# upstream.postBuild; # upstream.postBuild;
# }); # });
# 2025/04/04: upstreaming is blocked on unar (gnustep), unless i also make that optional # 2025/05/12: out for PR: <https://github.com/NixOS/nixpkgs/pull/406599>
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; # xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
} }

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

@@ -29,6 +29,11 @@ let
); );
in in
[ [
(fetchpatch' {
name = "xarchiver: build with strictDeps=true";
prUrl = "https://github.com/NixOS/nixpkgs/pull/406599";
hash = "sha256-xaI6YEGuxZaYtaTbfeTK9cr2ELhWnrO+Azic5aG6XbE=";
})
(fetchpatch' { (fetchpatch' {
# 2025-05-03: merged into staging # 2025-05-03: merged into staging
name = "qt6.{qttools,qtwayland}: fix cross compilation"; name = "qt6.{qttools,qtwayland}: fix cross compilation";