pcsc patch (#85)

This commit is contained in:
FraFrieFa 2024-02-09 01:28:03 +01:00 committed by GitHub
parent 307254ca34
commit cfea856b7f
2 changed files with 36 additions and 10 deletions

35
flake.lock generated
View File

@ -256,11 +256,11 @@
]
},
"locked": {
"lastModified": 1707090318,
"narHash": "sha256-/0Xq6+wh6ea4+4lnO/yUFTaBYzmQtA52/mOKfw08/J8=",
"lastModified": 1707261879,
"narHash": "sha256-eHYiImWo7osKadUGBWxerxJj2Rq5LkGnM5Q3geANKzU=",
"owner": "SuperSandro2000",
"repo": "nixos-modules",
"rev": "fdb31cd04b592d5fdfca96027b36e28e79e977c2",
"rev": "4c64fc579288708ff6667bb9e2d03fea56ad93e2",
"type": "github"
},
"original": {
@ -271,11 +271,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1707092692,
"narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
"lastModified": 1707268954,
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "faf912b086576fd1a15fca610166c98d47bc667e",
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"type": "github"
},
"original": {
@ -327,6 +327,22 @@
"type": "github"
}
},
"patch-pcsclite": {
"locked": {
"lastModified": 1707199254,
"narHash": "sha256-8jDsoIn5v3JcDXCeGMYA/fUWvrTzTZEg7J4PwcgYX/I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "952bd699447d82d69f4b15d994d5dc232e7addfb",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "952bd699447d82d69f4b15d994d5dc232e7addfb",
"type": "github"
}
},
"root": {
"inputs": {
"c3d2-user-module": "c3d2-user-module",
@ -340,6 +356,7 @@
"nixos-modules": "nixos-modules",
"nixpkgs": "nixpkgs",
"nixpkgs-fmt": "nixpkgs-fmt",
"patch-pcsclite": "patch-pcsclite",
"sops-nix": "sops-nix",
"systems": "systems"
}
@ -371,11 +388,11 @@
]
},
"locked": {
"lastModified": 1707015547,
"narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=",
"lastModified": 1707397511,
"narHash": "sha256-pYqXcTjcPC/go3FzT1dYtYsbmzAjO1MHhT/xgiI6J7o=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "23f61b897c00b66855074db471ba016e0cda20dd",
"rev": "2168851d58595431ee11ebfc3a49d60d318b7312",
"type": "github"
},
"original": {

View File

@ -9,6 +9,9 @@
};
inputs = {
#pcsc can not cross compile
patch-pcsclite.url = "github:nixos/nixpkgs?rev=952bd699447d82d69f4b15d994d5dc232e7addfb";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
systems.url = "github:nix-systems/default";
nix-index-database = {
@ -88,7 +91,7 @@
};
};
outputs = { self, nixpkgs-fmt, nix, home-manager, mailserver, nix-pre-commit, nixos-modules, nixpkgs, sops-nix, ... }@inputs:
outputs = { self, nixpkgs-fmt, nix, home-manager, mailserver, nix-pre-commit, nixos-modules, nixpkgs, sops-nix, patch-pcsclite, ... }@inputs:
let
inherit (nixpkgs) lib;
systems = [
@ -192,6 +195,12 @@
++ lib.optional (builtins.elem "sd" iso) "${toString nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
++ (if home then (map (user: { home-manager.users.${user} = import ./users/${user}/home.nix; }) users) else [ ])
++ lib.optional (system != "x86_64-linux") {
nixpkgs.overlays = [
(_self: super: {
pcsclite = patch-pcsclite.legacyPackages.${system}.nixpkgs.pcsclite;
})
];
} ++ lib.optional (system != "x86_64-linux") {
config.nixpkgs = {
config.allowUnsupportedSystem = true;
buildPlatform = "x86_64-linux";