diff --git a/overlays/cross.nix b/overlays/cross.nix
index 044f3c2fc..3efd9785d 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -1181,22 +1181,15 @@ in with final; {
   #   ];
   # });
 
-  # fixes: "data/meson.build:33:5: ERROR: Program 'msgfmt' not found or not executable"
-  # fixes: "src/meson.build:25:0: ERROR: Program 'gdbus-codegen' not found or not executable"
-  # 2024/08/12: upstreaming is blocked on xdg-desktop-portal
-  # xdg-desktop-portal-gnome = (
-  #   addNativeInputs [ wayland-scanner ] (
-  #     mvToNativeInputs [ gettext glib ] prev.xdg-desktop-portal-gnome
-  #   )
-  # );
-  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/09/28: xdg-desktop-portal-gnome builds fine if libjxl is patched to build
+  # 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
   # waybar = (prev.waybar.override {
diff --git a/pkgs/additional/nixpkgs/list.nix b/pkgs/additional/nixpkgs/list.nix
index 25b84f377..6c45f471a 100644
--- a/pkgs/additional/nixpkgs/list.nix
+++ b/pkgs/additional/nixpkgs/list.nix
@@ -46,6 +46,13 @@ in
     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' {
     title = "wike: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/338807";