fabian/nix
1
0
Fork 2
Code Issues 16 Pull requests Projects Releases Packages Wiki Activity

trivionomicon: athena-bccr: add support for non-Athena driver vendors

Browse source
This commit is contained in:
Alejandro Soto 2026-03-02 19:48:42 -06:00
parent 62eee95d99
commit 57f673b495
6 changed files with 152 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/athena-bccr/sys.nix
View file

@ -6,17 +6,18 @@
... ...
}: let }: let
athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release}; athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release};
inherit (athena.card-driver) vendor;
in { in {
environment = { environment = {
etc = { etc = lib.optionalAttrs (vendor == "athena") {
"Athena".source = "${athena.ase-pkcs11}/etc/Athena"; "Athena".source = "${athena.card-driver}/etc/Athena";
"pkcs11/modules/asep11".text = '' "pkcs11/modules/asep11".text = ''
module: ${athena.libasep11} module: ${athena.pkcs11-module}
''; '';
}; };
systemPackages = [athena.ase-pkcs11]; systemPackages = [athena.card-driver];
}; };
security = { security = {

10
pkgs/athena-bccr/default.nix
View file

@ -16,15 +16,15 @@
}; };
pkgsForRelease = release: let pkgsForRelease = release: let
ase-pkcs11 = unwrapped.ase-idprotect.lib; inherit (unwrapped) card-driver bccr-cacerts;
libasep11 = "${ase-pkcs11}/lib/x64-athena/libASEP11.so";
unwrapped = overrideUnwrapped {inherit release;} {}; unwrapped = overrideUnwrapped {inherit release;} {};
pkcs11-module = "${card-driver.lib}/${card-driver.pkcs11-path}";
in { in {
inherit ase-pkcs11 libasep11; inherit card-driver bccr-cacerts pkcs11-module;
inherit (unwrapped) ase-idprotect bccr-cacerts;
gaudi = callPackage ./gaudi-env.nix {inherit unwrapped;}; gaudi = callPackage ./gaudi-env.nix {inherit unwrapped;};
firmador = callPackage ./firmador.nix {inherit libasep11;}; firmador = callPackage ./firmador.nix {inherit pkcs11-module;};
}; };
in in
lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};}) lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};})

6
pkgs/athena-bccr/firmador.nix
View file

@ -5,7 +5,7 @@
maven, maven,
openjdk, openjdk,
wrapGAppsHook3, wrapGAppsHook3,
libasep11 ? null, pkcs11-module ? null,
}: let }: let
jdk = openjdk.override { jdk = openjdk.override {
enableJavaFX = true; enableJavaFX = true;
@ -34,8 +34,8 @@ in
wrapGAppsHook3 wrapGAppsHook3
]; ];
postPatch = lib.optionalString (libasep11 != null) '' postPatch = lib.optionalString (pkcs11-module != null) ''
sed -i 's@/usr/lib/x64-athena/libASEP11.so@${libasep11}@g' src/main/java/cr/libre/firmador/signers/CRSigner.java sed -i 's@/usr/lib/x64-athena/libASEP11.so@${pkcs11-module}@g' src/main/java/cr/libre/firmador/signers/CRSigner.java
''; '';
installPhase = '' installPhase = ''

2
pkgs/athena-bccr/gaudi-env.nix
View file

@ -12,7 +12,7 @@ in
name = "gaudi"; name = "gaudi";
targetPkgs = pkgs: [ targetPkgs = pkgs: [
unwrappedWithGaudi.ase-idprotect.lib unwrappedWithGaudi.card-driver.lib
unwrappedWithGaudi.gaudi unwrappedWithGaudi.gaudi
(writeShellScriptBin "launch-gaudi" '' (writeShellScriptBin "launch-gaudi" ''

1
pkgs/athena-bccr/releases.nix
View file

@ -3,6 +3,7 @@
# nix hash convert --hash-algo sha256 --from base16 --to sri $(sha256sum sfd_ClientesLinux_DEB64_Rev26.zip | cut -d' ' -f1) # nix hash convert --hash-algo sha256 --from base16 --to sri $(sha256sum sfd_ClientesLinux_DEB64_Rev26.zip | cut -d' ' -f1)
hash = "sha256-ZPWP9TqJQ5coJAPzUSiaXKVItBWlqFM4smCjOf+gqQM="; hash = "sha256-ZPWP9TqJQ5coJAPzUSiaXKVItBWlqFM4smCjOf+gqQM=";
basename = "sfd_ClientesLinux_DEB64_Rev26"; basename = "sfd_ClientesLinux_DEB64_Rev26";
vendor = "athena";
srcPaths = { srcPaths = {
gaudi = "Firma Digital/Agente GAUDI/agente-gaudi_20.0_amd64.deb"; gaudi = "Firma Digital/Agente GAUDI/agente-gaudi_20.0_amd64.deb";

12
pkgs/athena-bccr/unwrapped.nix
View file

@ -5,7 +5,7 @@
gaudiHash ? null, gaudiHash ? null,
... ...
}: let }: let
inherit (release) srcPaths; inherit (release) srcPaths vendor;
src = requireFile { src = requireFile {
url = "https://soportefirmadigital.com"; url = "https://soportefirmadigital.com";
@ -42,7 +42,7 @@
''; '';
} }
// lib.removeAttrs args ["stdenv" "dpkg" "unzip" "srcPath" "nativeBuildInputs"]); // lib.removeAttrs args ["stdenv" "dpkg" "unzip" "srcPath" "nativeBuildInputs"]);
in {
ase-idprotect = { ase-idprotect = {
autoPatchelfHook, autoPatchelfHook,
dpkg, dpkg,
@ -89,8 +89,11 @@ in {
preFixup = '' preFixup = ''
patchelf --set-rpath $lib/lib/x64-athena $out/bin/* patchelf --set-rpath $lib/lib/x64-athena $out/bin/*
''; '';
};
passthru.pkcs11-path = "lib/x64-athena/libASEP11.so";
};
in
{
gaudi = { gaudi = {
autoPatchelfHook, autoPatchelfHook,
dpkg, dpkg,
@ -224,3 +227,6 @@ in {
echo -e "\ngaudiHash: $(nix-hash --to-sri --type sha256 $(sha256sum "$zip_path" | cut -d' ' -f1))" echo -e "\ngaudiHash: $(nix-hash --to-sri --type sha256 $(sha256sum "$zip_path" | cut -d' ' -f1))"
''; '';
} }
// lib.optionalAttrs (vendor == "athena") {
card-driver = ase-idprotect;
}