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

overlays/cross: remove more commented-out bits which have been upstreamed

Browse Source
This commit is contained in:
Colin
2024-12-19 10:45:52 +00:00
parent 49727b9453
commit 8158045205
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
overlays/cross.nix
View File

@@ -681,8 +681,8 @@ in with final; {
# # fixes "fatal error: lmdb++.h: No such file or directory
# buildInputs = orig.buildInputs ++ [ lmdbxx ];
# });
# 2024/05/31: upstreaming blocked on emacs (and maybe ruby, libgccjit?)
# - previous upstreaming attemt: <https://github.com/NixOS/nixpkgs/pull/225111/files>
# 2024/12/18: upstreaming blocked on emacs (and maybe ruby, libgccjit?)
# - previous upstreaming attempt: <https://github.com/NixOS/nixpkgs/pull/225111/files>
# notmuch = prev.notmuch.overrideAttrs (upstream: {
# # fixes "Error: The dependencies of notmuch could not be satisfied" (xapian, gmime, glib, talloc)
# # when cross-compiling, we only have a triple-prefixed pkg-config which notmuch's configure script doesn't know how to find.
@@ -736,15 +736,6 @@ in with final; {
# # buildInputs = lib.remove gnupg upstream.buildInputs;
# });
# pantheon = prev.pantheon.overrideScope (self: super: {
# # 2024/09/17: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/342648>
# switchboard-plug-network = super.switchboard-plug-network.overrideAttrs (upstream: {
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# buildPackages.gettext #< for msgfmt
# ];
# });
# });
# fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
# 2024/08/12: upstreaming is unblocked
# phoc = mvToNativeInputs [ wayland-scanner glib ] prev.phoc;
@@ -1021,16 +1012,6 @@ in with final; {
# - i think the build script tries to run the generated binary?
# vpnc = mvToNativeInputs [ perl ] prev.vpnc;
# 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 {
# runTests = false; #< upstream expects `catch2_3` as a runtime requirement