From 4c4801d6a8822477b5e35ad0ab94b791e3be9c6d Mon Sep 17 00:00:00 2001 From: Dennis <52411861+DerDennisOP@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:51:38 +0100 Subject: [PATCH] remove nix-index-database from rpi (#95) * remove nix-index-database from rpi * Udev fix * flake update * add git alias * Remove unused flake input Signed-off-by: ahuston-0 --------- Signed-off-by: ahuston-0 Co-authored-by: Fabius Co-authored-by: ahuston-0 --- flake.lock | 12 ++++++------ flake.nix | 13 +++++++------ systems/palatine-hill/configuration.nix | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cb868ea..a0340e0 100644 --- a/flake.lock +++ b/flake.lock @@ -327,19 +327,19 @@ "type": "github" } }, - "patch-pcsclite": { + "patch-systemd": { "locked": { - "lastModified": 1707199254, - "narHash": "sha256-8jDsoIn5v3JcDXCeGMYA/fUWvrTzTZEg7J4PwcgYX/I=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "952bd699447d82d69f4b15d994d5dc232e7addfb", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "952bd699447d82d69f4b15d994d5dc232e7addfb", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" } }, @@ -356,7 +356,7 @@ "nixos-modules": "nixos-modules", "nixpkgs": "nixpkgs", "nixpkgs-fmt": "nixpkgs-fmt", - "patch-pcsclite": "patch-pcsclite", + "patch-systemd": "patch-systemd", "sops-nix": "sops-nix", "systems": "systems" } diff --git a/flake.nix b/flake.nix index acdbcf2..0720d69 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,8 @@ }; inputs = { - #pcsc can not cross compile - patch-pcsclite.url = "github:nixos/nixpkgs?rev=952bd699447d82d69f4b15d994d5dc232e7addfb"; + # pcsc, fido2, systemd can not cross compile + patch-systemd.url = "github:nixos/nixpkgs?rev=d934204a0f8d9198e1e4515dd6fec76a139c87f0"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default"; @@ -105,7 +105,7 @@ }; }; - outputs = { self, nixpkgs-fmt, nix, home-manager, mailserver, nix-pre-commit, nixos-modules, nixpkgs, sops-nix, patch-pcsclite, ... }@inputs: + outputs = { self, nixpkgs-fmt, nix, home-manager, mailserver, nix-pre-commit, nixos-modules, nixpkgs, sops-nix, ... }@inputs: let inherit (nixpkgs) lib; systems = [ @@ -220,9 +220,10 @@ }) users) else [ ]) ++ lib.optional (system != "x86_64-linux") { nixpkgs.overlays = [ - (_self: super: { - pcsclite = patch-pcsclite.legacyPackages.${system}.pcsclite; - }) + (_self: super: (builtins.listToAttrs (map (name: { + name = name; + value = inputs.patch-systemd.legacyPackages.${system}.${name}; + }) (builtins.attrNames inputs.patch-systemd.legacyPackages.${system})))) ]; } ++ lib.optional (system != "x86_64-linux") { config.nixpkgs = { diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index b991deb..5694298 100644 --- a/systems/palatine-hill/configuration.nix +++ b/systems/palatine-hill/configuration.nix @@ -20,6 +20,7 @@ filesystem = "zfs"; useSystemdBoot = true; kernelParams = [ "i915.force_probe=56a5" "i915.enable_guc=2" ]; + binfmt.emulatedSystems = [ "aarch64-linux" ]; }; nix = {