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

push apache cross fixes upstream

Browse Source
This commit is contained in:
Colin
2024-12-05 12:53:06 +00:00
parent fb21826666
commit 85fae592f6
2 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
overlays/cross.nix
View File

@@ -145,26 +145,27 @@ in with final; {
# ''; # '';
# }); # });
# 2024/12/05: out for PR: <https://github.com/NixOS/nixpkgs/pull/362066>
# fix apxs shebang; needed by mod_dnssd # fix apxs shebang; needed by mod_dnssd
apacheHttpd_2_4 = prev.apacheHttpd_2_4.overrideAttrs (upstream: { # apacheHttpd_2_4 = prev.apacheHttpd_2_4.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [ # nativeBuildInputs = upstream.nativeBuildInputs ++ [
buildPackages.perl #< should be `perl`, but the overlay approach loses splicing (?) # buildPackages.perl #< should be `perl`, but the overlay approach loses splicing (?)
]; # ];
}); # });
apacheHttpdPackagesFor = apacheHttpd: self: # apacheHttpdPackagesFor = apacheHttpd: self:
let # let
prevHttpdPkgs = prev.apacheHttpdPackagesFor apacheHttpd self; # prevHttpdPkgs = prev.apacheHttpdPackagesFor apacheHttpd self;
in # in
prevHttpdPkgs // { # prevHttpdPkgs // {
# fixes "configure: error: *** Sorry, could not find apxs ***" # # fixes "configure: error: *** Sorry, could not find apxs ***"
# SEE NIXPKGS BRANCH: pr-mod_dnssd-cross # # SEE NIXPKGS BRANCH: pr-mod_dnssd-cross
mod_dnssd = prevHttpdPkgs.mod_dnssd.overrideAttrs (upstream: { # mod_dnssd = prevHttpdPkgs.mod_dnssd.overrideAttrs (upstream: {
configureFlags = upstream.configureFlags ++ [ # configureFlags = upstream.configureFlags ++ [
"--with-apxs=${lib.getDev apacheHttpd}/bin" # "--with-apxs=${lib.getDev apacheHttpd}/bin"
]; # ];
}); # });
}; # };
# bamf: required via pantheon.switchboard -> wingpanel -> gala # bamf: required via pantheon.switchboard -> wingpanel -> gala
# bamf = prev.bamf.overrideAttrs (upstream: { # bamf = prev.bamf.overrideAttrs (upstream: {

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

@@ -48,24 +48,13 @@ in
# }) # })
(fetchpatch' { (fetchpatch' {
name = "gnome-maps: fix cross compilation"; name = "apacheHttpdPackages.mod_dnssd: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/357238"; prUrl = "https://github.com/NixOS/nixpkgs/pull/362066";
hash = "sha256-o2mwpO2b4vTnoqQYAIHpxK/VOwGXR65p25x3HyDte8k="; hash = "sha256-a7gLTrMgb2hExLcI0vHKr7N3FDWAlwkEPmbPCrj/D5w=";
})
(fetchpatch' {
name = "gtk4-layer-shell: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/357230";
hash = "sha256-v4OUuzpB8kXIU25r20SKtASEUwz/tgxCQQ6WQL1I/N8=";
})
(fetchpatch' {
name = "samba: resurrect cross compilation patch";
prUrl = "https://github.com/NixOS/nixpkgs/pull/357988";
hash = "sha256-bVpojIRpJr6PDvsPMsqWGjCV8SWzwJ2hudzSPJcdN4k=";
}) })
(fetchpatch' { (fetchpatch' {
# merged into staging 2024/11/28
name = "poppler: format, add dependency for glib-mkenums to fix cross building"; name = "poppler: format, add dependency for glib-mkenums to fix cross building";
prUrl = "https://github.com/NixOS/nixpkgs/pull/357344"; prUrl = "https://github.com/NixOS/nixpkgs/pull/357344";
hash = "sha256-3Yv6Yy1K2dNrrduM2XTEDjSmkysguTbqb8T7mDK2ubI="; hash = "sha256-3Yv6Yy1K2dNrrduM2XTEDjSmkysguTbqb8T7mDK2ubI=";