diff --git a/nix/default.nix b/nix/default.nix
index 380a343f9907d5529143c4d178a80842e260bb65..c3d35503553f640dfc80aae2a6dc5984c517c536 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -45,16 +45,16 @@ rec {
         setupHook = pkgs.writeText "setupHook.sh" ''
           addFramaCPath () {
             if test -d "''$1/lib/frama-c/plugins"; then
-              export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
-              export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
+              export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN:-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
+              export OCAMLPATH="''${OCAMLPATH:-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
             fi
 
             if test -d "''$1/lib/frama-c"; then
-              export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c"
+              export OCAMLPATH="''${OCAMLPATH:-}''${OCAMLPATH:+:}''$1/lib/frama-c"
             fi
 
             if test -d "''$1/share/frama-c/"; then
-              export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
+              export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE:-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
             fi
 
           }
diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix
index 253aa3a7ad72aa528e17649174e094d0cf561127..652e17f7378aa86a80c711d11cb4444f4b191eb3 100644
--- a/nix/frama-ci.nix
+++ b/nix/frama-ci.nix
@@ -5,7 +5,7 @@ let
     src = builtins.fetchGit {
             "url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
             "name" = "Frama-CI";
-            "rev" = "85ba4a2c716d3f992f75bd838463a36b86cf7ccb";
+            "rev" = "4add9658dfda894a5db9de59aa7a5657c8cf7b2b";
             "ref" = "feature/ci/update-opam";
     };
  in