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

cross: avoid building samba

Browse Source 
i was already trying to avoid it, just missed some spots
This commit is contained in:
Colin
2023-11-27 23:27:25 +00:00
parent 1729f29374
commit 413669d118
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overlays/cross.nix
View File

@@ -1840,6 +1840,10 @@ in {
}; };
}); });
# waf-setup-hook: python3-aarch64-unknown-linux-gnu-3.11.6/bin/python: cannot execute binary file: Exec format error
# NOTE: not enough to fix build. better to just ensure we don't need samba
# samba = needsBinfmt prev.samba;
# samba = prev.samba.overrideAttrs (_upstream: { # samba = prev.samba.overrideAttrs (_upstream: {
# # we get "cannot find C preprocessor: aarch64-unknown-linux-gnu-cpp", but ONLY when building with the ccache stdenv. # # we get "cannot find C preprocessor: aarch64-unknown-linux-gnu-cpp", but ONLY when building with the ccache stdenv.
# # this solves that, but `CPP` must be a *single* path -- not an expression. # # this solves that, but `CPP` must be a *single* path -- not an expression.

26
overlays/preferences.nix
View File

@@ -6,10 +6,6 @@
evolution-data-server = gsuper.evolution-data-server.override { evolution-data-server = gsuper.evolution-data-server.override {
# OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation # OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation
enableOAuth2 = false; enableOAuth2 = false;
gnome-online-accounts = gnome-online-accounts.override {
# avoid webkitgtk_4_1 build
enableBackend = false;
};
}; };
# gnome-shell = gsuper.gnome-shell.override { # gnome-shell = gsuper.gnome-shell.override {
# evolution-data-server-gtk4 = evolution-data-server-gtk4.override { # evolution-data-server-gtk4 = evolution-data-server-gtk4.override {
@@ -18,23 +14,19 @@
# }; # };
# }; # };
}); });
gnome-online-accounts = super.gnome-online-accounts.override {
# disables the upstream "goabackend" feature -- presumably "Gnome Online Accounts Backend"
# frees us from webkit_4_1, in turn.
enableBackend = false;
gvfs = gvfs.override {
# saves 20 minutes of build time and cross issues, for unused feature
samba = null;
};
};
phog = super.phog.override { phog = super.phog.override {
# disable squeekboard because it takes 20 minutes to compile when emulated # disable squeekboard because it takes 20 minutes to compile when emulated
squeekboard = null; squeekboard = null;
gnome.gnome-shell = gnome.gnome-shell.override {
evolution-data-server-gtk4 = evolution-data-server-gtk4.override {
gnome-online-accounts = gnome-online-accounts.override {
# disables the upstream "goabackend" feature -- presumably "Gnome Online Accounts Backend"
# frees us from webkit_4_1, in turn.
enableBackend = false;
gvfs = gvfs.override {
# saves 20 minutes of build time and cross issues, for unused feature
samba = null;
};
};
};
};
}; };
pipewire = super.pipewire.override { pipewire = super.pipewire.override {