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

cross: remove upstreamed libvpx patch

Browse Source
This commit is contained in:
Colin 2024-06-15 11:37:20 +00:00
parent 0e73f95ab1
commit d8ed82cfdf
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
overlays/cross.nix
View File

@ -751,12 +751,6 @@ in with final; {
# ];
# });
# upstreaming: <https://github.com/NixOS/nixpkgs/pull/317477>
libvpx = prev.libvpx.overrideAttrs (upstream: {
# fails building neon extensions for armv7l; see <https://github.com/NixOS/nixpkgs/issues/208746>
configureFlags = builtins.map (lib.replaceStrings [ "armv7l-linux-gcc" ] [ "armv7-linux-gcc" ]) upstream.configureFlags;
});
# 2024/05/31: upstreaming blocked on qtsvg, libgweather, appstream, glycin-loaders
loupe = prev.loupe.overrideAttrs (upstream: {
postPatch = (upstream.postPatch or "") + ''

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

@ -24,13 +24,6 @@ let
);
in
[
# TODO: apply this once it's fixed for aarch64
# (fetchpatch' {
# title = "libvpx: fix cross compiling for armv7";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/317477";
# hash = "sha256-5W/5/u2CXJJEgTjPx/do6SRZ6WEfhlAi/qXYS/Lsb14=";
# })
# (fetchpatch' {
# title = "pantheon.switchboard-plug-sound: support cross compilation";
# saneCommit = "86f85de8d008710a11b7b3653ec594438374059e";