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

overlays/cross: remove dead code which has been successfully upstreamed

Browse Source
This commit is contained in:
Colin
2024-12-19 09:17:21 +00:00
parent 39eb2cf08b
commit 3598ca7657
1 changed files with 0 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
overlays/cross.nix
View File

@@ -121,52 +121,6 @@ let
inherit (cargo) meta; inherit (cargo) meta;
}; };
in with final; { in with final; {
# 2024/05/31: upstreaming is unblocked (but this solution no longer works)
# apacheHttpd_2_4 = prev.apacheHttpd_2_4.overrideAttrs (upstream: {
# configureFlags = upstream.configureFlags or [] ++ [
# "ap_cv_void_ptr_lt_long=no" # configure can't AC_TRY_RUN, and can't validate that sizeof (void*) == sizeof long
# ];
# # let nix figure out the perl shebangs.
# # some of these perl scripts are shipped on the host, others in the .dev output for the build machine.
# # postPatch methods create cycles
# # postPatch = ''
# # substituteInPlace configure --replace \
# # '/replace/with/path/to/perl/interpreter' \
# # '/usr/bin/perl'
# # '';
# # postPatch = ''
# # substituteInPlace support/apxs.in --replace \
# # '@perlbin@' \
# # '/usr/bin/perl'
# # '';
# postFixup = upstream.postFixup or "" + ''
# sed -i 's:/replace/with/path/to/perl/interpreter:${buildPackages.perl}/bin/perl:' $dev/bin/apxs
# '';
# });
# 2024/12/05: out for PR: <https://github.com/NixOS/nixpkgs/pull/362066>
# fix apxs shebang; needed by mod_dnssd
# apacheHttpd_2_4 = prev.apacheHttpd_2_4.overrideAttrs (upstream: {
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# buildPackages.perl #< should be `perl`, but the overlay approach loses splicing (?)
# ];
# });
# apacheHttpdPackagesFor = apacheHttpd: self:
# let
# prevHttpdPkgs = prev.apacheHttpdPackagesFor apacheHttpd self;
# in
# prevHttpdPkgs // {
# # fixes "configure: error: *** Sorry, could not find apxs ***"
# # SEE NIXPKGS BRANCH: pr-mod_dnssd-cross
# mod_dnssd = prevHttpdPkgs.mod_dnssd.overrideAttrs (upstream: {
# configureFlags = upstream.configureFlags ++ [
# "--with-apxs=${lib.getDev apacheHttpd}/bin"
# ];
# });
# };
# bamf: required via pantheon.switchboard -> wingpanel -> gala # bamf: required via pantheon.switchboard -> wingpanel -> gala
# bamf = prev.bamf.overrideAttrs (upstream: { # bamf = prev.bamf.overrideAttrs (upstream: {
# # "You must have gtk-doc >= 1.0 installed to build documentation" # # "You must have gtk-doc >= 1.0 installed to build documentation"
@@ -443,20 +397,6 @@ in with final; {
]; ];
}; };
# 2024/11/19: upstreaming is unblocked
# out for PR: <https://github.com/NixOS/nixpkgs/pull/357238>
# gnome-maps = prev.gnome-maps.overrideAttrs (upstream: {
# postPatch = (upstream.postPatch or "") + ''
# # fixes: "ERROR: Program 'gjs' not found or not executable"
# substituteInPlace meson.build \
# --replace-fail "find_program('gjs')" "find_program('${gjs}/bin/gjs')"
# '';
# });
# 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig".
# 2024/12/16: out for PR: <https://github.com/NixOS/nixpkgs/pull/365814>
# gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
gnome-settings-daemon = prev.gnome-settings-daemon.overrideAttrs (orig: { gnome-settings-daemon = prev.gnome-settings-daemon.overrideAttrs (orig: {
# 2024/12/16: upstreaming is blocked on poppler-glib (should be fixed in staging?) # 2024/12/16: upstreaming is blocked on poppler-glib (should be fixed in staging?)
# gsd is required by xdg-desktop-portal-gtk # gsd is required by xdg-desktop-portal-gtk
@@ -477,24 +417,6 @@ in with final; {
# buildInputs = orig.buildInputs ++ [ pcre2 ]; # buildInputs = orig.buildInputs ++ [ pcre2 ];
# }); # });
# 2024/12/16: out for PR: <https://github.com/NixOS/nixpkgs/pull/365810>
# gnome-user-share = addNativeInputs [ glib ] prev.gnome-user-share;
# gnome-user-share = prev.gnome-user-share.overrideAttrs (upstream: {
# postPatch = (upstream.postPatch or "") + ''
# substituteInPlace meson.build --replace-fail \
# "run_command([httpd, '-v']" \
# "run_command(['${stdenv.hostPlatform.emulator buildPackages}', httpd, '-v']"
# '';
# # nativeBuildInputs = upstream.nativeBuildInputs ++ lib.optionals (!prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform) [
# # buildPackages.mesonEmulatorHook
# # ];
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# # fixes: meson.build:111:6: ERROR: Program 'glib-compile-schemas' not found or not executable
# buildPackages.glib
# ];
# });
# gnome = prev.gnome.overrideScope (self: super: { # gnome = prev.gnome.overrideScope (self: super: {
# # 2024/05/31: upstreaming is blocked by a LOT: qtbase, qtsvg, webp-pixbuf-loader, libgweather, gnome-color-manager, appstream, apache-httpd, ibus # # 2024/05/31: upstreaming is blocked by a LOT: qtbase, qtsvg, webp-pixbuf-loader, libgweather, gnome-color-manager, appstream, apache-httpd, ibus
# # fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable" # # fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
@@ -559,20 +481,6 @@ in with final; {
# # ); # # );
# }); # });
# 2024/11/19: upstreaming is unblocked
# out for PR: <https://github.com/NixOS/nixpkgs/pull/357230>
# gtk4-layer-shell = mvToBuildInputs [ wayland-protocols ] prev.gtk4-layer-shell;
# out for PR: <https://github.com/NixOS/nixpkgs/pull/263182>
# hspell = prev.hspell.overrideAttrs (upstream: {
# # build perl is needed by the Makefile,
# # but $out/bin/multispell (which is simply copied from src) should use host perl
# buildInputs = (upstream.buildInputs or []) ++ [ perl ];
# postInstall = ''
# patchShebangs --update $out/bin/multispell
# '';
# });
# 2024/08/12: upstreaming is unblocked # 2024/08/12: upstreaming is unblocked
# hyprland = mvToNativeInputs [ hwdata ] prev.hyprland; # hyprland = mvToNativeInputs [ hwdata ] prev.hyprland;
# hyprland = prev.hyprland.overrideAttrs (_: { # hyprland = prev.hyprland.overrideAttrs (_: {
@@ -583,17 +491,6 @@ in with final; {
# "setup: line 1595: ant: command not found" # "setup: line 1595: ant: command not found"
# i2p = mvToNativeInputs [ ant gettext ] prev.i2p; # i2p = mvToNativeInputs [ ant gettext ] prev.i2p;
# 2024/08/12: upstreaming is unblocked (see `pkgs/patched/ibus`)
# ibus = prev.ibus.overrideAttrs (upstream: {
# nativeBuildInputs = upstream.nativeBuildInputs or [] ++ [
# glib # fixes: ImportError: /nix/store/fi1rsalr11xg00dqwgzbf91jpl3zwygi-gobject-introspection-aarch64-unknown-linux-gnu-1.74.0/lib/gobject-introspection/giscanner/_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory
# buildPackages.gobject-introspection # fixes "_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory"
# ];
# buildInputs = lib.remove gobject-introspection upstream.buildInputs ++ [
# vala # fixes: "Package `ibus-1.0' not found in specified Vala API directories or GObject-Introspection GIR directories"
# ];
# });
# 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc # 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc
iotas = prev.iotas.overrideAttrs (_: { iotas = prev.iotas.overrideAttrs (_: {
# error: "<iotas> is not allowed to refer to the following paths: <build python>" # error: "<iotas> is not allowed to refer to the following paths: <build python>"
@@ -644,44 +541,6 @@ in with final; {
lemoa = prev.lemoa.override { cargo = crossCargo; }; lemoa = prev.lemoa.override { cargo = crossCargo; };
# libgweather = prev.libgweather.overrideAttrs (upstream: {
# nativeBuildInputs = (lib.remove gobject-introspection upstream.nativeBuildInputs) ++ [
# buildPackages.gobject-introspection # fails to fix "gi._error.GError: g-invoke-error-quark: Could not locate g_option_error_quark: /nix/store/dsx6kqmyg7f3dz9hwhz7m3jrac4vn3pc-glib-aarch64-unknown-linux-gnu-2.74.3/lib/libglib-2.0.so.0"
# ];
# # fixes "Run-time dependency vapigen found: NO (tried pkgconfig)"
# buildInputs = upstream.buildInputs ++ [ vala ];
# });
# 2023/08/27: out for PR: <https://github.com/NixOS/nixpkgs/pull/251956>
# libgweather = (prev.libgweather.override {
# # we need introspection for bindings, used by e.g.
# # - gnome.gnome-weather (javascript)
# # - sane-weather (python)
# #
# # enabling introspection on cross is tricky because `gen_locations_variant.py`
# # outputs binary files (Locations.bin) which use the endianness of the build machine
# # OTOH, aarch64 and x86_64 have same endianness: why not just ignore the issue, then?
# # upstream issue (loosely related): <https://gitlab.gnome.org/GNOME/libgweather/-/issues/154>
# withIntrospection = true;
# }).overrideAttrs (upstream: {
# # TODO: the `is_cross_build` change to meson.build is in nixpkgs, but specifies the wrong filepath
# # (libgweather/meson.build instead of meson.build)
# postPatch = (upstream.postPatch or "") + ''
# sed -i '2i import os; os.environ["GI_TYPELIB_PATH"] = ""' build-aux/meson/gen_locations_variant.py
# substituteInPlace meson.build \
# --replace "g_ir_scanner.found() and not meson.is_cross_build()" "g_ir_scanner.found()"
# substituteInPlace libgweather/meson.build \
# --replace "dependency('vapigen'," "dependency('vapigen', native:true,"
# '';
# });
# 2024/09/28: upstreaming is unblocked, implemented on branch `pr-libpeas2-cross`
# libpeas2 = prev.libpeas2.overrideAttrs (upstream: {
# mesonFlags = upstream.mesonFlags ++ [
# "-Dlua51=false" #< fails to find lua (probably it incorrectly checks the build machine)
# ];
# });
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: { # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
# phonon = super.phonon.overrideAttrs (orig: { # phonon = super.phonon.overrideAttrs (orig: {
# # fixes "ECM (required version >= 5.60), Extra CMake Modules" # # fixes "ECM (required version >= 5.60), Extra CMake Modules"
@@ -1195,19 +1054,6 @@ in with final; {
# - i think the build script tries to run the generated binary? # - i think the build script tries to run the generated binary?
# vpnc = mvToNativeInputs [ perl ] prev.vpnc; # vpnc = mvToNativeInputs [ perl ] prev.vpnc;
# 2024/09/17: upstreaming is unblocked, out for review: <https://github.com/NixOS/nixpkgs/pull/342669>
# xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (upstream: {
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# # fixes "meson.build:117:8: ERROR: Program 'bwrap' not found or not executable"
# bubblewrap
# ]; # ++ upstream.nativeCheckInputs;
# mesonFlags = (upstream.mesonFlags or []) ++ [
# # fixes "tests/meson.build:268:9: ERROR: Program 'pytest-3 pytest' not found or not executable"
# # nixpkgs should add this whenever doCheck == false, i think
# "-Dpytest=disabled"
# ];
# });
# 2024/09/28: xdg-desktop-portal-gnome builds fine if libjxl is patched to build # 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 { # xdg-desktop-portal-gnome = prev.xdg-desktop-portal-gnome.override {
# # xdp-gnome uses libjxl as a gdk pixbuf loader, # # xdp-gnome uses libjxl as a gdk pixbuf loader,
@@ -1245,16 +1091,6 @@ in with final; {
# strictDeps = true; # strictDeps = true;
# }); # });
# 2024/09/01: upstreaming is unblocked; out for PR <https://github.com/NixOS/nixpkgs/pull/338807>
# wike = prev.wike.overrideAttrs (upstream: {
# # error: "<wike> is not allowed to refer to the following paths: <build python>"
# # wike's meson build script sets host binaries to use build PYTHON
# # disallowedReferences = [];
# postFixup = (upstream.postFixup or "") + ''
# patchShebangs --update $out/share/wike/wike-sp
# '';
# });
# 2024/08/12: upstreaming is unblocked # 2024/08/12: upstreaming is unblocked
# fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o) # fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o)
# wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: { # wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: {