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

gnome-frog: fix cross compilation

Browse Source
This commit is contained in:
Colin
2023-12-11 03:27:46 +00:00
parent 9e2c0a7112
commit f044fcb584
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/modules/gui/default.nix
View File

@@ -78,6 +78,7 @@ in
# "gnome.gnome-terminal" # works on phosh # "gnome.gnome-terminal" # works on phosh
"gnome.gnome-weather" "gnome.gnome-weather"
"gnome.seahorse" # keyring/secret manager "gnome.seahorse" # keyring/secret manager
"gnome-frog" # OCR/QR decoder
"gpodder" "gpodder"
"gthumb" "gthumb"
"gtkcord4" # Discord client. 2023/11/21: disabled because v0.0.12 leaks memory "gtkcord4" # Discord client. 2023/11/21: disabled because v0.0.12 leaks memory

5
nixpatches/list.nix
View File

@@ -28,6 +28,11 @@ in [
saneCommit = "8631ddfb99aa8e935276b27d55ef5e10f5ab0367"; saneCommit = "8631ddfb99aa8e935276b27d55ef5e10f5ab0367";
hash = "sha256-AkxtrCJrf0wpTdty4SOIWBrWwqfG7rBI4ON38BjDi6s="; hash = "sha256-AkxtrCJrf0wpTdty4SOIWBrWwqfG7rBI4ON38BjDi6s=";
}) })
(fetchpatch' {
title = "python3Packages.numpy: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/268587";
hash = "sha256-GRRLXwUw2JXEV6Ov0QiVTFwoi/ACManG2Qk7D3fzS8E=";
})
# (fetchpatch' { # (fetchpatch' {
# title = "nixos/slskd: allow omitting username from yaml config"; # title = "nixos/slskd: allow omitting username from yaml config";
# saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63"; # saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";

9
overlays/cross.nix
View File

@@ -872,6 +872,15 @@ in with final; {
# 2023/12/08: upstreaming is unblocked (but requires building webkitgtk-4.0) # 2023/12/08: upstreaming is unblocked (but requires building webkitgtk-4.0)
gthumb = mvInputs { nativeBuildInputs = [ glib ]; } prev.gthumb; gthumb = mvInputs { nativeBuildInputs = [ glib ]; } prev.gthumb;
gnome-frog = prev.gnome-frog.overrideAttrs (upstream: {
# blueprint-compiler runs on the build machine, but tries to load gobject-introspection types meant for the host.
postPatch = (upstream.postPatch or "") + ''
substituteInPlace data/meson.build --replace \
"find_program('blueprint-compiler')" \
"'env', 'GI_TYPELIB_PATH=${buildPackages.gdk-pixbuf.out}/lib/girepository-1.0:${buildPackages.harfbuzz.out}/lib/girepository-1.0:${buildPackages.gtk4.out}/lib/girepository-1.0:${buildPackages.graphene}/lib/girepository-1.0:${buildPackages.libadwaita}/lib/girepository-1.0:${buildPackages.pango.out}/lib/girepository-1.0', find_program('blueprint-compiler')"
'';
});
gnome = prev.gnome.overrideScope' (self: super: { gnome = prev.gnome.overrideScope' (self: super: {
# dconf-editor = super.dconf-editor.override { # dconf-editor = super.dconf-editor.override {
# # fails to fix original error # # fails to fix original error