don't fail when nix.env hasn't been generate yet

RyanGibb · May 23, 2024 · f2a88c8 · f2a88c8
1 parent 187d0cf
commit f2a88c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/state/opamEnv.ml b/src/state/opamEnv.ml
@@ -544,8 +544,8 @@ let compute_updates ?(force_path=false) st =
     let open OpamFilename in
     create (OpamPath.Switch.meta OpamStateConfig.(!r.root_dir) st.switch) (basename (raw "nix.env"))
     |> OpamFile.make
-    |> OpamFile.Environment.read
-    |> List.map resolve_separator_and_format
+    |> OpamFile.Environment.read_opt
+    |> Option.fold ~none:[] ~some:(List.map resolve_separator_and_format)
   in
   switch_env @ pkg_env @ man_path @ [path] @ nix_env