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

cross: libgweather/tuba: grab from upstream PRs

Browse Source
This commit is contained in:
Colin
2023-08-28 12:04:03 +00:00
parent d4a305f5bb
commit 53aee9e651
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixpatches/list.nix
View File

@@ -359,13 +359,15 @@ in [
}) })
(fetchpatch' { (fetchpatch' {
title = "libgweather: enable introspection on cross builds"; title = "libgweather: enable introspection on cross builds";
prUrl = "https://github.com/NixOS/nixpkgs/pull/251956";
saneCommit = "7a2d0a90cc558ea71dfc78356e61b0675b995634"; saneCommit = "7a2d0a90cc558ea71dfc78356e61b0675b995634";
hash = "sha256-5uOYxC4+ZMjIbO1oSA/8ffuftgHSbrGuKjw3EnCHakU="; hash = "sha256-tjO19dXVUrD+V+YpD7z3iWSgNyOirG70HuQ+c+0fZYA=";
}) })
(fetchpatch' { (fetchpatch' {
title = "tuba: support cross compilation"; title = "tuba: support cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/251958";
saneCommit = "fc1121488c2358644f2d149bebf049512471adc0"; saneCommit = "fc1121488c2358644f2d149bebf049512471adc0";
hash = "sha256-ZTFC/bu/pO3s+SPQmKhvd+Y+tNE0KVK6bL+Br86A1eM="; hash = "sha256-OYSWpymoiP/15nMJ/NwapufHEPKnCoGrUq4QwxM22mo=";
}) })
# (fetchpatch' { # (fetchpatch' {

4
overlays/cross.nix
View File

@@ -930,7 +930,7 @@ in {
# buildInputs = upstream.buildInputs ++ [ final.vala ]; # buildInputs = upstream.buildInputs ++ [ final.vala ];
# }); # });
# TODO(2023/08/27): send out for PR: <https://github.com/NixOS/nixpkgs/compare/master...uninsane:nixpkgs:pr-cross-libgweather> # 2023/08/27: out for PR: <https://github.com/NixOS/nixpkgs/compare/master...uninsane:nixpkgs:pr-cross-libgweather>
# libgweather = (prev.libgweather.override { # libgweather = (prev.libgweather.override {
# # we need introspection for bindings, used by e.g. # # we need introspection for bindings, used by e.g.
# # - gnome.gnome-weather (javascript) # # - gnome.gnome-weather (javascript)
@@ -1831,7 +1831,7 @@ in {
# # fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment." # # fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment."
# addNativeInputs [ final.mesonEmulatorHook ] prev.tracker-miners # addNativeInputs [ final.mesonEmulatorHook ] prev.tracker-miners
# ); # );
# TODO(2023/08/27): send for PR: <https://github.com/uninsane/nixpkgs/pull/new/pr-cross-tuba> # 2023/08/27: out for PR: <https://github.com/uninsane/nixpkgs/pull/new/pr-cross-tuba>
# tuba = (wrapGAppsHook4Fix prev.tuba).overrideAttrs (upstream: { # tuba = (wrapGAppsHook4Fix prev.tuba).overrideAttrs (upstream: {
# # 2023/07/27: upstreaming is blocked on p11-kit cross compilation # # 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 # # error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories