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

cross: tuba: grab from nixpkgs fork

Browse Source
This commit is contained in:
Colin 2023-08-28 11:52:39 +00:00
parent fd39efe31f
commit d4a305f5bb
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixpatches/list.nix
View File

@ -362,6 +362,11 @@ in [
saneCommit = "7a2d0a90cc558ea71dfc78356e61b0675b995634";
hash = "sha256-5uOYxC4+ZMjIbO1oSA/8ffuftgHSbrGuKjw3EnCHakU=";
})
(fetchpatch' {
title = "tuba: support cross compilation";
saneCommit = "fc1121488c2358644f2d149bebf049512471adc0";
hash = "sha256-ZTFC/bu/pO3s+SPQmKhvd+Y+tNE0KVK6bL+Br86A1eM=";
})
# (fetchpatch' {
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped

11
overlays/cross.nix
View File

@ -1831,11 +1831,12 @@ in {
# # fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment."
# addNativeInputs [ final.mesonEmulatorHook ] prev.tracker-miners
# );
tuba = (wrapGAppsHook4Fix prev.tuba).overrideAttrs (upstream: {
# 2023/07/27: upstreaming is blocked on p11-kit cross compilation
# error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories
buildInputs = upstream.buildInputs ++ [ final.vala ];
});
# TODO(2023/08/27): send for PR: <https://github.com/uninsane/nixpkgs/pull/new/pr-cross-tuba>
# tuba = (wrapGAppsHook4Fix prev.tuba).overrideAttrs (upstream: {
# # 2023/07/27: upstreaming is blocked on p11-kit cross compilation
# # error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories
# buildInputs = upstream.buildInputs ++ [ final.vala ];
# });
# twitter-color-emoji = prev.twitter-color-emoji.override {
# # fails to fix original error
# inherit (emulated) stdenv;