Switch opentitan dev env to buildFHSEnvOverlay

The cert workaround seems to be no longer necessarry.
lowRISC · Sep 5, 2024 · 6e92750 · 6e92750
1 parent f551ab9
commit 6e92750
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/dev/opentitan.nix b/dev/opentitan.nix
@@ -31,8 +31,9 @@
     '';
   };
 in
-  (pkgs.buildFHSEnv {
-    name = "opentitan";
+  (pkgs.buildFHSEnvOverlay {
+    pname = "opentitan";
+    version = "dev";
     targetPkgs = _:
       with pkgs;
         [
@@ -85,12 +86,6 @@ in
         ++ extraPkgs;
     extraOutputsToInstall = ["dev"];
 
-    extraBwrapArgs = [
-      # OpenSSL included in the Python downloaded by Bazel makes use of these paths.
-      "--symlink ${pkgs.openssl.out}/etc/ssl/openssl.cnf /etc/ssl/openssl.cnf"
-      "--symlink /etc/ssl/certs/ca-certificates.crt /etc/ssl/cert.pem"
-    ];
-
     profile = ''
       # Workaround bazel bug: https://github.com/bazelbuild/bazel/issues/23217
       export TMPDIR=/tmp