cross: comment out/remove a few more cross fixes for packages i don't plan to use
This commit is contained in:
parent
9710d55c6a
commit
4ce0c23c19
|
|
@ -410,7 +410,6 @@ in with final; {
|
|||
|
||||
# 2023/10/23: upstreaming blocked by gvfs, webkitgtk 4.1
|
||||
# fixes: "error: Package <foo> not found in specified Vala API directories or GObject-Introspection GIR directories"
|
||||
# needs binfmt for docs: "scangobj.py:execute_command:1293:WARNING:Running scanner failed: [Errno 8] Exec format error: './calls-scan', command: ./calls-scan"
|
||||
calls = prev.calls.overrideAttrs (upstream: {
|
||||
# TODO: try building with mesonEmulatorHook when i upstream this
|
||||
# nativeBuildInputs = upstream.nativeBuildInputs ++ lib.optionals (!prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform) [
|
||||
|
|
@ -730,6 +729,7 @@ in with final; {
|
|||
# });
|
||||
|
||||
# 2024/02/27: upstreaming is blocked on qtsvg (via pipewire)
|
||||
# required by epiphany, gnome-settings-daemon
|
||||
# N.B.: should be able to remove gnupg/ssh from {native}buildInputs when upstreaming
|
||||
gcr_4 = prev.gcr_4.overrideAttrs (upstream: {
|
||||
# fixes (meson): "ERROR: Program 'gpg2 gpg' not found or not executable"
|
||||
|
|
@ -884,14 +884,15 @@ in with final; {
|
|||
# # "-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
|
||||
# # ];
|
||||
# });
|
||||
gnome-shell = super.gnome-shell.overrideAttrs (upstream: {
|
||||
# 2023/08/01: upstreaming is blocked on argyllcms, gnome-keyring, gnome-clocks, ibus, libavif, webp-pixbuf-loader
|
||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||
gjs # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
|
||||
];
|
||||
});
|
||||
# gnome-shell = super.gnome-shell.overrideAttrs (upstream: {
|
||||
# # 2023/08/01: upstreaming is blocked on argyllcms, gnome-keyring, gnome-clocks, ibus, libavif, webp-pixbuf-loader
|
||||
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||
# gjs # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
|
||||
# ];
|
||||
# });
|
||||
gnome-settings-daemon = super.gnome-settings-daemon.overrideAttrs (orig: {
|
||||
# 2023/07/31: upstreaming is blocked on qtsvg (ffado)
|
||||
# 2024/02/27: upstreaming is blocked on qtsvg (ffado)
|
||||
# gsd is required by xdg-desktop-portal-gtk
|
||||
# glib solves: "Program 'glib-mkenums mkenums' not found or not executable"
|
||||
nativeBuildInputs = orig.nativeBuildInputs ++ [ glib ];
|
||||
# pkg-config solves: "plugins/power/meson.build:22:0: ERROR: Dependency lookup for glib-2.0 with method 'pkgconfig' failed: Pkg-config binary for machine 0 not found."
|
||||
|
|
@ -916,20 +917,20 @@ in with final; {
|
|||
# fixes: meson.build:111:6: ERROR: Program 'glib-compile-schemas' not found or not executable
|
||||
# gnome-user-share = addNativeInputs [ glib ] super.gnome-user-share;
|
||||
|
||||
mutter = super.mutter.overrideAttrs (orig: {
|
||||
# 2024/02/27: upstreaming is blocked on appstream, possibly others
|
||||
# N.B.: not all of this suitable to upstreaming, as-is.
|
||||
# mesa and xorgserver are removed here because they *themselves* don't build for `buildPackages` (temporarily: 2023/10/26)
|
||||
nativeBuildInputs = lib.subtractLists [ mesa xorg.xorgserver ] orig.nativeBuildInputs;
|
||||
buildInputs = orig.buildInputs ++ [
|
||||
mesa # fixes "meson.build:237:2: ERROR: Dependency "gbm" not found, tried pkgconfig"
|
||||
libGL # fixes "meson.build:184:11: ERROR: Dependency "gl" not found, tried pkgconfig and system"
|
||||
];
|
||||
# Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
|
||||
mesonFlags = lib.remove "-Ddocs=true" orig.mesonFlags;
|
||||
outputs = lib.remove "devdoc" orig.outputs;
|
||||
postInstall = lib.replaceStrings [ "${glib.dev}" ] [ "${buildPackages.glib.dev}" ] orig.postInstall;
|
||||
});
|
||||
# mutter = super.mutter.overrideAttrs (orig: {
|
||||
# # 2024/02/27: upstreaming is blocked on appstream, possibly others
|
||||
# # N.B.: not all of this suitable to upstreaming, as-is.
|
||||
# # mesa and xorgserver are removed here because they *themselves* don't build for `buildPackages` (temporarily: 2023/10/26)
|
||||
# nativeBuildInputs = lib.subtractLists [ mesa xorg.xorgserver ] orig.nativeBuildInputs;
|
||||
# buildInputs = orig.buildInputs ++ [
|
||||
# mesa # fixes "meson.build:237:2: ERROR: Dependency "gbm" not found, tried pkgconfig"
|
||||
# libGL # fixes "meson.build:184:11: ERROR: Dependency "gl" not found, tried pkgconfig and system"
|
||||
# ];
|
||||
# # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
|
||||
# mesonFlags = lib.remove "-Ddocs=true" orig.mesonFlags;
|
||||
# outputs = lib.remove "devdoc" orig.outputs;
|
||||
# postInstall = lib.replaceStrings [ "${glib.dev}" ] [ "${buildPackages.glib.dev}" ] orig.postInstall;
|
||||
# });
|
||||
# nautilus = (
|
||||
# # 2023/11/21: upstreaming is blocked on apache-httpd, webp-pixbuf-loader, qtsvg
|
||||
# addInputs {
|
||||
|
|
@ -1156,22 +1157,22 @@ in with final; {
|
|||
# '';
|
||||
# });
|
||||
|
||||
# 2023/11/21: upstreaming is blocked by qtsvg (via pipewire/ffado)
|
||||
libpanel = prev.libpanel.overrideAttrs (upstream: {
|
||||
doCheck = false;
|
||||
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
|
||||
# # fixes "Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)"
|
||||
# pkg-config
|
||||
# ];
|
||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||
buildPackages.gtk4 # fixes "ERROR: Program 'gtk-update-icon-cache' not found or not executable"
|
||||
];
|
||||
# it can't figure out where gi-docgen lives
|
||||
mesonFlags = (upstream.mesonFlags or []) ++ [
|
||||
"-Ddocs=disabled"
|
||||
];
|
||||
outputs = lib.remove "devdoc" upstream.outputs;
|
||||
});
|
||||
# 2024/02/27: upstreaming is blocked on appstream
|
||||
# libpanel = prev.libpanel.overrideAttrs (upstream: {
|
||||
# doCheck = false;
|
||||
# # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
|
||||
# # # fixes "Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)"
|
||||
# # pkg-config
|
||||
# # ];
|
||||
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||
# buildPackages.gtk4 # fixes "ERROR: Program 'gtk-update-icon-cache' not found or not executable"
|
||||
# ];
|
||||
# # it can't figure out where gi-docgen lives
|
||||
# mesonFlags = (upstream.mesonFlags or []) ++ [
|
||||
# "-Ddocs=disabled"
|
||||
# ];
|
||||
# outputs = lib.remove "devdoc" upstream.outputs;
|
||||
# });
|
||||
|
||||
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
|
||||
# qgpgme = super.qgpgme.overrideAttrs (orig: {
|
||||
|
|
@ -1865,6 +1866,7 @@ in with final; {
|
|||
# inherit (emulated) stdenv;
|
||||
# };
|
||||
|
||||
# spandsp: required by gst-plugins-bad
|
||||
spandsp = prev.spandsp.overrideAttrs (upstream: {
|
||||
configureFlags = upstream.configureFlags or [] ++ [
|
||||
# fixes runtime error: "undefined symbol: rpl_realloc"
|
||||
|
|
@ -1952,7 +1954,7 @@ in with final; {
|
|||
|
||||
# fixes: "ar: command not found"
|
||||
# `ar` is provided by bintools
|
||||
# 2023/12/08: upstreaming is blocked on gnustep-base cross compilation
|
||||
# 2024/02/27: upstreaming is blocked on gnustep-base cross compilation
|
||||
unar = addNativeInputs [ bintools ] prev.unar;
|
||||
# unixODBCDrivers = prev.unixODBCDrivers // {
|
||||
# # TODO: should this package be deduped with toplevel psqlodbc in upstream nixpkgs?
|
||||
|
|
|
|||
Loading…
Reference in New Issue