diff --git a/lib/customisation.nix b/lib/customisation.nix
index feee85393906d0a..97e650ab8bab303 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -249,7 +249,8 @@ rec {
       outputs = drv.outputs or ["out"];
 
       commonAttrs =
-        { inherit (drv) name system meta; inherit outputs; }
+        { inherit (drv) name meta; inherit outputs; }
+        // lib.optionalAttrs (drv?system) { inherit (drv) system; }
         // lib.optionalAttrs (drv._hydraAggregate or false) {
           _hydraAggregate = true;
           constituents = map hydraJob (lib.flatten drv.constituents);