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

cross: libpeas2: proper build fix, and work toward upstreaming

Browse Source
This commit is contained in:
Colin
2024-09-29 13:55:44 +00:00
parent c9d5d3eeca
commit f3de4c5da3
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
overlays/cross.nix
View File

@@ -633,12 +633,12 @@ in with final; {
# ''; # '';
# }); # });
# 2024/08/12: upstreaming is unblocked # 2024/09/28: upstreaming is unblocked, implemented on branch `pr-libpeas2-cross`
libpeas2 = prev.libpeas2.overrideAttrs (upstream: { # libpeas2 = prev.libpeas2.overrideAttrs (upstream: {
mesonFlags = upstream.mesonFlags ++ [ # mesonFlags = upstream.mesonFlags ++ [
"-Dlua51=false" #< fails to find lua (probably it incorrectly checks the build machine) # "-Dlua51=false" #< fails to find lua (probably it incorrectly checks the build machine)
]; # ];
}); # });
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: { # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
# phonon = super.phonon.overrideAttrs (orig: { # phonon = super.phonon.overrideAttrs (orig: {

12
pkgs/additional/nixpkgs/list.nix
View File

@@ -3,6 +3,7 @@ let
fetchpatch' = { fetchpatch' = {
saneCommit ? null, saneCommit ? null,
nixpkgsCommit ? null, nixpkgsCommit ? null,
saneGhCommit ? null,
prUrl ? null, prUrl ? null,
hash ? null, hash ? null,
title ? null, title ? null,
@@ -16,8 +17,10 @@ let
"${prUrl}.diff?full_index=1" "${prUrl}.diff?full_index=1"
else if saneCommit != null then else if saneCommit != null then
"https://git.uninsane.org/colin/nixpkgs/commit/${saneCommit}.diff" "https://git.uninsane.org/colin/nixpkgs/commit/${saneCommit}.diff"
else else if nixpkgsCommit != null then
"https://github.com/NixOS/nixpkgs/commit/${nixpkgsCommit}.patch?full_index=1" "https://github.com/NixOS/nixpkgs/commit/${nixpkgsCommit}.patch?full_index=1"
else
"https://github.com/uninsane/nixpkgs/commit/${saneGhCommit}.patch?full_index=1"
; ;
in fetchpatch2 ( in fetchpatch2 (
{ inherit revert url; } { inherit revert url; }
@@ -53,6 +56,13 @@ in
hash = "sha256-/DESr9b7ZV7TPZ4ZMBIUiF6BxT2VzGSvri+7lRFXeLE="; hash = "sha256-/DESr9b7ZV7TPZ4ZMBIUiF6BxT2VzGSvri+7lRFXeLE=";
}) })
(fetchpatch' {
# TODO: send upstream: <https://github.com/uninsane/nixpkgs/pull/new/pr-libpeas2-cross>
title = "libpeas2: fix cross compilation";
saneGhCommit = "7062afb2ff428fa0ee8b5635ae06d5adb6fbb396";
hash = "sha256-rvJLYnmZIr1WYzcZG6gGj/5bNPBRA3Vw/RslhGFjnR4=";
})
(fetchpatch' { (fetchpatch' {
title = "wike: fix cross compilation"; title = "wike: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/338807"; prUrl = "https://github.com/NixOS/nixpkgs/pull/338807";