WIP: moby: partially working cross compilation for phosh w/o apps (webkitgtk build OOMs)
This commit is contained in:
parent
7491114915
commit
6cbeccf51f
|
@ -11,7 +11,7 @@
|
||||||
sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip;
|
sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip;
|
||||||
|
|
||||||
# TODO: re-enable once base is cross-compiled
|
# TODO: re-enable once base is cross-compiled
|
||||||
sane.programs.phoshApps.enableSuggested = false;
|
sane.programs.guiApps.enableSuggested = false;
|
||||||
|
|
||||||
# cross-compiled documentation is *slow*.
|
# cross-compiled documentation is *slow*.
|
||||||
# no obvious way to natively compile docs (2022/09/29).
|
# no obvious way to natively compile docs (2022/09/29).
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
|
|
||||||
sane.nixcache.enable = true;
|
sane.nixcache.enable = true;
|
||||||
sane.persist.enable = true;
|
sane.persist.enable = true;
|
||||||
# sane.gui.phosh.enable = true;
|
sane.gui.phosh.enable = true;
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
# /boot space is at a premium. default was 20.
|
# /boot space is at a premium. default was 20.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# these are the overlays which we *also* pass through to the cross and emulated package sets.
|
# these are the overlays which we *also* pass through to the cross and emulated package sets.
|
||||||
|
@ -22,6 +22,12 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# options = {
|
||||||
|
# perlPackageOverrides = lib.mkOption {
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
|
config = {
|
||||||
# the configuration of which specific package set `pkgs.cross` refers to happens elsewhere;
|
# the configuration of which specific package set `pkgs.cross` refers to happens elsewhere;
|
||||||
# here we just define them all.
|
# here we just define them all.
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
|
@ -34,30 +40,72 @@ in
|
||||||
|
|
||||||
emulated = mkEmulated prev;
|
emulated = mkEmulated prev;
|
||||||
})
|
})
|
||||||
(next: prev: {
|
(next: prev:
|
||||||
|
let
|
||||||
|
emulated = prev.emulated;
|
||||||
|
in {
|
||||||
# packages which don't cross compile
|
# packages which don't cross compile
|
||||||
inherit (prev.emulated)
|
inherit (emulated)
|
||||||
|
# adwaita-qt # psqlodbc
|
||||||
|
apacheHttpd # TODO: not properly patched
|
||||||
|
appstream
|
||||||
|
blueman
|
||||||
|
brltty
|
||||||
|
cantarell-fonts # python3.10-skia-pathops
|
||||||
|
colord
|
||||||
duplicity # python3.10-s3transfer
|
duplicity # python3.10-s3transfer
|
||||||
|
evince
|
||||||
|
flakpak
|
||||||
fuzzel
|
fuzzel
|
||||||
fwupd-efi
|
fwupd-efi
|
||||||
fwupd
|
fwupd
|
||||||
|
gcr
|
||||||
|
gmime
|
||||||
|
# gnome-keyring
|
||||||
|
# gnome-remote-desktop
|
||||||
|
gnome-tour
|
||||||
# gnustep-base # (used by unar)
|
# gnustep-base # (used by unar)
|
||||||
gocryptfs # gocryptfs-2.3-go-modules
|
gocryptfs # gocryptfs-2.3-go-modules
|
||||||
# grpc
|
# grpc
|
||||||
|
gst_all_1 # gst_all_1.gst-editing-services
|
||||||
|
gupnp
|
||||||
|
gupnp_1_6
|
||||||
|
gvfs
|
||||||
|
flatpak
|
||||||
hdf5
|
hdf5
|
||||||
http2
|
http2
|
||||||
|
ibus
|
||||||
kitty
|
kitty
|
||||||
iio-sensor-proxy
|
iio-sensor-proxy
|
||||||
libHX
|
libHX
|
||||||
pam_mount
|
libgweather
|
||||||
pipewire
|
librest
|
||||||
|
librest_1_0
|
||||||
|
libsForQt5 # qtbase
|
||||||
|
mod_dnssd
|
||||||
ncftp
|
ncftp
|
||||||
|
obex_data_server
|
||||||
|
openfortivpn
|
||||||
|
ostree
|
||||||
|
pam_mount
|
||||||
|
perl # perl5.36.0-Test-utf8
|
||||||
|
pipewire
|
||||||
|
psqlodbc
|
||||||
|
pulseaudio # python3.10-defcon
|
||||||
|
# qgnomeplatform
|
||||||
|
# qtbase
|
||||||
|
qt6 # psqlodbc
|
||||||
rmlint
|
rmlint
|
||||||
sequoia
|
sequoia
|
||||||
# splatmoji
|
# splatmoji
|
||||||
|
squeekboard
|
||||||
|
sysprof
|
||||||
|
tracker-miners # it just can't run tests
|
||||||
twitter-color-emoji # python3.10-defcon
|
twitter-color-emoji # python3.10-defcon
|
||||||
unar # python3.10-psycopg2
|
unar # python3.10-psycopg2
|
||||||
visidata # python3.10-psycopg2
|
visidata # python3.10-psycopg2
|
||||||
|
vpnc
|
||||||
|
webp-pixbuf-loader
|
||||||
xdg-utils # perl5.36.0-File-BaseDir
|
xdg-utils # perl5.36.0-File-BaseDir
|
||||||
;
|
;
|
||||||
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||||
|
@ -66,6 +114,48 @@ in
|
||||||
# # psycopg2 = py-prev.psycopg2.override { inherit prev.emulated.stdenv; };
|
# # psycopg2 = py-prev.psycopg2.override { inherit prev.emulated.stdenv; };
|
||||||
# })
|
# })
|
||||||
# ];
|
# ];
|
||||||
|
|
||||||
|
gnome = prev.gnome.overrideScope' (self: super: {
|
||||||
|
inherit (emulated.gnome)
|
||||||
|
gnome-color-manager
|
||||||
|
gnome-keyring
|
||||||
|
gnome-remote-desktop # TODO: figure out what's asking for this and remove it
|
||||||
|
gnome-user-share
|
||||||
|
mutter
|
||||||
|
;
|
||||||
|
});
|
||||||
|
|
||||||
|
# gst_all_1.gst-editing-services = emulated.gst_all_1.gst-editing-services;
|
||||||
|
|
||||||
|
# gst_all_1 = prev.gst_all_1.overrideScope' (self: super: {
|
||||||
|
# inherit (emulated.gst_all_1)
|
||||||
|
# gst-editing-services
|
||||||
|
# ;
|
||||||
|
# });
|
||||||
|
|
||||||
|
# libsForQt5 = prev.libsForQt5.overrideScope' (self: super: {
|
||||||
|
# inherit (emulated.libsForQt5)
|
||||||
|
# qtbase
|
||||||
|
# ;
|
||||||
|
# });
|
||||||
|
|
||||||
|
# apacheHttpdPackagesFor = apacheHttpd: self:
|
||||||
|
# let
|
||||||
|
# prevHttpdPkgs = lib.fix (emulated.apacheHttpdPackagesFor apacheHttpd);
|
||||||
|
# in
|
||||||
|
# (prev.apacheHttpdPackagesFor apacheHttpd self) // {
|
||||||
|
# # inherit (prevHttpdPkgs) mod_dnssd;
|
||||||
|
# mod_dnssd = prevHttpdPkgs.mod_dnssd.override {
|
||||||
|
# inherit (self) apacheHttpd;
|
||||||
|
# };
|
||||||
|
# };
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# perlPackageOverrides = _perl: {
|
||||||
|
# inherit (pkgs.emulated.perl.pkgs)
|
||||||
|
# Testutf8
|
||||||
|
# ;
|
||||||
|
# };
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user