From 1e9ddff3003c1a1a349bc74b95ad222b288e3f3b Mon Sep 17 00:00:00 2001
From: technofab <admin@technofab.de>
Date: Wed, 3 Dec 2025 20:47:39 +0100
Subject: [PATCH] fix(modules/job): fix variables with nix store paths getting
 dropped

---
 lib/impl/modules/job.nix |  2 +-
 tests/modules_test.nix   | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/impl/modules/job.nix b/lib/impl/modules/job.nix
index 295093d..fd4fc62 100644
--- a/lib/impl/modules/job.nix
+++ b/lib/impl/modules/job.nix
@@ -646,8 +646,8 @@ in rec {
       };
       depsDrv = cilib.mkJobDeps {
         key = name;
-        job = config.finalConfig;
         nixConfig = config.nix;
+        inherit job;
       };
       runnerDrv = cilib.mkJobRun {
         key = name;
diff --git a/tests/modules_test.nix b/tests/modules_test.nix
index e134293..8ccbd83 100644
--- a/tests/modules_test.nix
+++ b/tests/modules_test.nix
@@ -77,6 +77,27 @@
             assert_file_contains ${package} '"EXAMPLE":"/nix/store/.*-hello-.*"'
           '';
       }
+      {
+        name = "correctly inject variables containing nix store paths at runtime";
+        type = "script";
+        script = let
+          package =
+            (cilib.mkCI {
+              pipelines."test".jobs."test" = {
+                stage = ".pre";
+                variables.EXAMPLE = "${pkgs.hello}";
+                script = [];
+              };
+            }).packages."gitlab-ci:pipeline:test:job-deps:test";
+        in
+          # sh
+          ''
+            ${ntlib.helpers.path [pkgs.gnugrep]}
+            ${ntlib.helpers.scriptHelpers}
+            assert_file_contains ${package} 'export PATH=":$PATH";'
+            assert_file_contains ${package} 'export EXAMPLE="/nix/store/.*-hello-.*"'
+          '';
+      }
     ];
   };
 }