add qemu patch for unshare

This commit is contained in:
Henry Hiles 2025-08-30 12:52:32 -04:00
commit d088d31c37
No known key found for this signature in database
7 changed files with 27 additions and 73 deletions

View file

@ -1,42 +0,0 @@
{
lib,
inputs,
...
}: let
ibusPath = "i18n/input-method/default.nix";
in {
# disabledModules = [ibusPath];
# imports = [
# (import "${inputs.ibus-fix}/nixos/modules/${ibusPath}")
# ];
# nixpkgs.overlays = [
# (_: super: {
# # https://github.com/NixOS/nixpkgs/pull/434550
# iniparser = super.iniparser.overrideAttrs (old: {
# cmakeFlags = [
# (lib.cmakeBool "BUILD_TESTING" false)
# ];
# });
# # TODO: Upstream to nixpkgs
# glycin-loaders = super.glycin-loaders.overrideAttrs (old: {
# env.CARGO_BUILD_TARGET = super.stdenv.hostPlatform.rust.rustcTargetSpec;
# postPatch = ''
# substituteInPlace loaders/meson.build \
# --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${super.stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader,"
# '';
# nativeBuildInputs = (old.nativeBuildInputs or []) ++ [super.buildPackages.rustPlatform.cargoSetupHook];
# cargoVendorDir = "vendor";
# });
# # TODO: Maybe upstream to nixpkgs (ruby maintainer please reply to my DM)
# ruby_3_3 = super.ruby_3_3.overrideAttrs (old: {
# NIX_RUSTFLAGS =
# (old.NIX_RUSTFLAGS or "")
# + " --target ${super.stdenv.hostPlatform.rust.rustcTargetSpec}";
# });
# })
# ];
}

View file

@ -35,18 +35,6 @@ in {
};
};
# TODO: Fix:
# error: builder for '/nix/store/4pbzqss4j7xpbj742zjbhrbl5azdgfnl-image.drv' failed with exit code 1;
# last 7 log lines:
# > structuredAttrs is enabled
# > Running phase: patchPhase
# > 'repart.d' -> '/build/amended-repart.d'
# > Running phase: updateAutotoolsGnuConfigScriptsPhase
# > Running phase: buildPhase
# > Building image with systemd-repart...
# > unshare: unshare failed: Invalid argument
# For full logs, run 'nix log /nix/store/4pbzqss4j7xpbj742zjbhrbl5azdgfnl-image.drv'.
image.repart = {
name = "image";
partitions = {