fixups
This commit is contained in:
parent
09c2811768
commit
0648f2bf6f
2 changed files with 12 additions and 10 deletions
|
|
@ -11,6 +11,14 @@
|
||||||
glib = final.buildPackages.glib;
|
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
|
||||||
|
];
|
||||||
|
});
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -18,6 +26,10 @@
|
||||||
# and GNOME Shell connects apps to IBus itself, so the GTK module isn't used anyway.
|
# and GNOME Shell connects apps to IBus itself, so the GTK module isn't used anyway.
|
||||||
i18n.inputMethod.enableGtk3 = false;
|
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
|
# 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.
|
# module that uses the build platform's one for that step.
|
||||||
# TODO: upstream (use pkgs.buildPackages.mustache-go in core.nix)
|
# TODO: upstream (use pkgs.buildPackages.mustache-go in core.nix)
|
||||||
|
|
|
||||||
|
|
@ -6,16 +6,6 @@
|
||||||
"nix-direnv"
|
"nix-direnv"
|
||||||
];
|
];
|
||||||
|
|
||||||
# nixphone loads pmi8998_haptics in the initrd, but the kernel config doesn't build it
|
|
||||||
# TODO: upstream to nixphone
|
|
||||||
boot.kernelPatches = [
|
|
||||||
{
|
|
||||||
name = "pmi8998-haptics";
|
|
||||||
patch = null;
|
|
||||||
structuredExtraConfig.INPUT_QCOM_PMI8998_HAPTICS = lib.kernel.module;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
# TODO: flutter apps don't cross compile, and the flake's package isn't cached
|
# TODO: flutter apps don't cross compile, and the flake's package isn't cached
|
||||||
programs.nexus.enable = lib.mkForce false;
|
programs.nexus.enable = lib.mkForce false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue