remove old cross fixes that are no longer needed
This commit is contained in:
parent
5a9ab1f03e
commit
f924151c68
5 changed files with 13 additions and 72 deletions
|
|
@ -1,56 +1,8 @@
|
|||
{
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
gnome = prev.gnome // {
|
||||
nixos-gsettings-overrides = prev.gnome.nixos-gsettings-overrides.override {
|
||||
glib = final.buildPackages.glib;
|
||||
};
|
||||
};
|
||||
|
||||
# Meson looks for gio and gdbus-codegen for the build machine
|
||||
gnome-session = prev.gnome-session.overrideAttrs (old: {
|
||||
depsBuildBuild = (old.depsBuildBuild or [ ]) ++ [
|
||||
final.pkgsBuildBuild.pkg-config
|
||||
final.pkgsBuildBuild.glib
|
||||
];
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
# TODO: flutter apps don't cross compile, and the flake's package isn't cached
|
||||
programs.nexus.enable = lib.mkForce false;
|
||||
|
||||
# The cache builder doesn't find gtk-query-immodules-3.0 when cross compiling,
|
||||
# and GNOME Shell connects apps to IBus itself, so the GTK module isn't used anyway.
|
||||
i18n.inputMethod.enableGtk3 = false;
|
||||
|
||||
# Needs python gi on the build machine, and only connects desktop browsers to
|
||||
# extensions.gnome.org anyway.
|
||||
services.gnome.gnome-browser-connector.enable = false;
|
||||
|
||||
# nix-maid runs the host mustache-go at build time, swap in a copy of its core
|
||||
# module that uses the build platform's one for that step.
|
||||
# TODO: upstream (use pkgs.buildPackages.mustache-go in core.nix)
|
||||
maid.sharedModules =
|
||||
let
|
||||
core = "${inputs.nix-maid}/src/maid/modules/core.nix";
|
||||
in
|
||||
[
|
||||
{
|
||||
disabledModules = [ core ];
|
||||
imports = [
|
||||
(builtins.toFile "nix-maid-core.nix" (
|
||||
builtins.replaceStrings
|
||||
[ "import ../vars.nix" "lib.getExe pkgs.mustache-go" ]
|
||||
[ "import ${inputs.nix-maid}/src/maid/vars.nix" "lib.getExe pkgs.buildPackages.mustache-go" ]
|
||||
(builtins.readFile core)
|
||||
))
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.quadphone;
|
||||
host = config.nixpkgs.hostPlatform;
|
||||
|
||||
otherOverlays = lib.init config.nixpkgs.overlays;
|
||||
|
|
@ -41,8 +40,7 @@ let
|
|||
let
|
||||
name = lib.concatStringsSep "." path;
|
||||
in
|
||||
!(builtins.elem name cfg.crossPackages)
|
||||
&& builtins.match toolchainRegex name == null
|
||||
builtins.match toolchainRegex name == null
|
||||
&& lib.isDerivation native
|
||||
&& lib.meta.availableOn host native
|
||||
&& (native.meta.license.free or true)
|
||||
|
|
@ -96,15 +94,6 @@ let
|
|||
v;
|
||||
in
|
||||
{
|
||||
options.quadphone.crossPackages = lib.mkOption {
|
||||
type = with lib.types; listOf str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Top-level attribute names that should always be cross-compiled instead of
|
||||
substituted from the binary cache (i.e. ones that turn out not to be cached).
|
||||
'';
|
||||
};
|
||||
|
||||
config = {
|
||||
nixpkgs.buildPlatform = "x86_64-linux";
|
||||
|
||||
|
|
|
|||
15
flake.lock
generated
15
flake.lock
generated
|
|
@ -996,17 +996,18 @@
|
|||
},
|
||||
"nix-maid": {
|
||||
"locked": {
|
||||
"lastModified": 1794213517,
|
||||
"narHash": "sha256-bryY6i495uT5OEz0eSeTPeJ35E6JLpI0PjPGNa5EdRk=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "d4f00026e380858e683a022abe313a0ae52ad2c0",
|
||||
"revCount": 136,
|
||||
"lastModified": 1795019049,
|
||||
"narHash": "sha256-bxUur5b6+llgV+XlGcSGApS3Z/iIINYz3Rt4/poxX5c=",
|
||||
"ref": "quad/fix/cross-mustache",
|
||||
"rev": "ccd9b3f24f80e4aa9b25074e50fb1c1a8124f4d0",
|
||||
"revCount": 137,
|
||||
"type": "git",
|
||||
"url": "https://codeberg.org/viperML/nix-maid"
|
||||
"url": "https://codeberg.org/Henry-Hiles/nix-maid"
|
||||
},
|
||||
"original": {
|
||||
"ref": "quad/fix/cross-mustache",
|
||||
"type": "git",
|
||||
"url": "https://codeberg.org/viperML/nix-maid"
|
||||
"url": "https://codeberg.org/Henry-Hiles/nix-maid"
|
||||
}
|
||||
},
|
||||
"nix2flatpak": {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
wrapper-manager.url = "git+https://codeberg.org/viperML/wrapper-manager";
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
nix-maid.url = "git+https://codeberg.org/viperML/nix-maid";
|
||||
nix-maid.url = "git+https://codeberg.org/Henry-Hiles/nix-maid?ref=quad/fix/cross-mustache";
|
||||
gadgetfs = {
|
||||
url = "github:sorki/nixos-gadgetfs-proto";
|
||||
flake = false;
|
||||
|
|
|
|||
|
|
@ -133,10 +133,9 @@ in
|
|||
HandlePowerKeyLongPress = "poweroff";
|
||||
};
|
||||
|
||||
# Let GTK use text-input-v3, so the on-screen keyboard gets the text fields.
|
||||
environment.extraInit = ''
|
||||
unset GTK_IM_MODULE QT_IM_MODULE XMODIFIERS
|
||||
'';
|
||||
# GNOME's core-os-services turns on IBus, but GTK has to use text-input-v3
|
||||
# so the on-screen keyboard gets the text fields.
|
||||
i18n.inputMethod.enable = false;
|
||||
|
||||
users.users.quadradical.maid.gsettings.settings.org.gnome.desktop = {
|
||||
a11y.applications.screen-keyboard-enabled = true;
|
||||
|
|
|
|||
Loading…
Reference in a new issue