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

cross: point playerctl patch to upstream PR

Browse Source
This commit is contained in:
Colin 2023-08-16 10:54:07 +00:00
parent 4f9d84cd82
commit 721899258a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixpatches/list.nix
View File

@ -358,6 +358,13 @@ in [
hash = "sha256-gqHUGeTQnr0f99gqEdd+VANLkWO+joLxz5I0RSarznE=";
})
(fetchpatch' {
title = "playerctl: support cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/249512";
saneCommit = "67df31a8984ab3067af5b65446d2808b0aedadc6";
hash = "sha256-qY0bjMoFneC5VJ467TeiuOycLYNaVO7Xo/0fCauDZAM=";
})
# (fetchpatch' {
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped
# title = "matrix-appservice-irc: 0.38.0 -> 1.0.0";

11
overlays/cross.nix
View File

@ -1,5 +1,6 @@
# upstreaming status:
# - xdg-utils builds on servo branch
# - playerctl is out for review
# - xdg-utils is out for review
# - xdg-utils is blocked on perl5.36.0-Module-Build
# - needed for File-BaseDir, used by File-MimeInfo
# - File-BaseDir can be updated to v0.09, which cross compiles with ease
@ -7,8 +8,6 @@
# - blueman builds on servo branch
# - tracker builds on servo branch
# - directfb needs investigation on servo
# patches need to be authored & sent upstream:
# - playerctl (just disable docs on cross)
#
# non-binfmt build status:
# - webkitgtk fails 90% through build:
@ -1325,9 +1324,9 @@ in {
# ffadoSupport = false;
# };
playerctl = prev.playerctl.overrideAttrs (upstream: {
mesonFlags = upstream.mesonFlags ++ [ "-Dgtk-doc=false" ];
});
# playerctl = prev.playerctl.overrideAttrs (upstream: {
# mesonFlags = upstream.mesonFlags ++ [ "-Dgtk-doc=false" ];
# });
# psqlodbc = prev.psqlodbc.override {
# # fixes "configure: error: odbc_config not found (required for unixODBC build)"