pkgs/athena-bccr: fix gaudi support

1 files changed, 12 insertions, 4 deletions

diff --git a/pkgs/athena-bccr/default.nix b/pkgs/athena-bccr/default.nix
index 16e2e36..cda0b62 100644
--- a/pkgs/athena-bccr/default.nix
+++ b/pkgs/athena-bccr/default.nix
@@ -5,18 +5,26 @@ let
   latest = "deb64-rev26";
 
   releases = lib.mapAttrs (name: release: release // { name = name; }) (import ./releases.nix);
-  unwrappedFor = release: lib.mapAttrs (_: pkg: callPackage pkg { }) (callPackage ./unwrapped.nix { inherit release; });
+
+  overrideUnwrapped = default: new:
+    let
+      args = default // new;
+      unwrappedPkgs = lib.filterAttrs (name: _: ! lib.elem name [ "override" "overrideDerivation" ]) (callPackage ./unwrapped.nix args);
+    in
+    lib.fix (unwrapped: lib.mapAttrs (_: pkg: callPackage pkg unwrapped) unwrappedPkgs) // {
+      override = overrideUnwrapped args;
+    };
 
   pkgsForRelease = release:
     let
       libasep11 = "${unwrapped.ase-idprotect}/lib/x64-athena/libASEP11.so";
-      unwrapped = unwrappedFor release;
+      unwrapped = overrideUnwrapped { inherit release; } { };
     in
     {
       inherit libasep11;
-      inherit (unwrapped) ase-idprotect;
+      inherit (unwrapped) ase-idprotect bccr-cacerts;
 
-      shell = callPackage ./fhs-env.nix { inherit unwrapped; };
+      gaudi = callPackage ./gaudi-env.nix { inherit unwrapped; };
       firmador = callPackage ./firmador.nix { inherit libasep11; };
     };
 in