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

cross: replace xdg-desktop-portal-gnome with an upstreamable libjxl fix

Browse Source
This commit is contained in:
Colin
2024-09-29 00:41:24 +00:00
parent 66d9957173
commit c44b5240d1
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
overlays/cross.nix
View File

@@ -1181,22 +1181,15 @@ in with final; {
# ]; # ];
# }); # });
# fixes: "data/meson.build:33:5: ERROR: Program 'msgfmt' not found or not executable" # 2024/09/28: xdg-desktop-portal-gnome builds fine if libjxl is patched to build
# fixes: "src/meson.build:25:0: ERROR: Program 'gdbus-codegen' not found or not executable" # xdg-desktop-portal-gnome = prev.xdg-desktop-portal-gnome.override {
# 2024/08/12: upstreaming is blocked on xdg-desktop-portal # # xdp-gnome uses libjxl as a gdk pixbuf loader,
# xdg-desktop-portal-gnome = ( # # but nixpkgs' libjxl disables the pixbuf loader when cross compiling,
# addNativeInputs [ wayland-scanner ] ( # # so xdp-gnome fails, expecting a pixbuf loader where there is none.
# mvToNativeInputs [ gettext glib ] prev.xdg-desktop-portal-gnome # # solution: disable the libjxl pixbuf loader (by replacing it with a working pixbuf, already used by xdp-gnome).
# ) # # this means no jpeg thumbnailing.
# ); # libjxl = webp-pixbuf-loader;
xdg-desktop-portal-gnome = prev.xdg-desktop-portal-gnome.override { # };
# xdp-gnome uses libjxl as a gdk pixbuf loader,
# but nixpkgs' libjxl disables the pixbuf loader when cross compiling,
# so xdp-gnome fails, expecting a pixbuf loader where there is none.
# solution: disable the libjxl pixbuf loader (by replacing it with a working pixbuf, already used by xdp-gnome).
# this means no jpeg thumbnailing.
libjxl = webp-pixbuf-loader;
};
# 2024/08/12: upstreaming is blocked on hyprland # 2024/08/12: upstreaming is blocked on hyprland
# waybar = (prev.waybar.override { # waybar = (prev.waybar.override {

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

@@ -46,6 +46,13 @@ in
hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw="; hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
}) })
(fetchpatch' {
# TODO: send upstream: <https://github.com/uninsane/nixpkgs/pull/new/pr-libjxl-cross2>
title = "libjxl: build plugins/loaders unconditionally";
saneCommit = "14dedbaa92dce20c6e342e1e763821da9381c68d";
hash = "sha256-/DESr9b7ZV7TPZ4ZMBIUiF6BxT2VzGSvri+7lRFXeLE=";
})
(fetchpatch' { (fetchpatch' {
title = "wike: fix cross compilation"; title = "wike: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/338807"; prUrl = "https://github.com/NixOS/nixpkgs/pull/338807";