about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Marshall <andrew@johnandrewmarshall.com>2024-06-03 22:40:16 -0400
committerAndrew Marshall <andrew@johnandrewmarshall.com>2024-06-03 23:41:29 -0400
commitf299debaac1cd0271291e9061aae486b46be2400 (patch)
treece46d41c309cc15064395aa504804f283a4f8fd8
parent518daacfe2ee732432b4a7dac19b72eda037d44d (diff)
bundlerEnv: Fix passthru not being passed-through
E.g. `pkgs.bundlerEnv { passthru = { ... }; ... }` previously would not
result in the `passthru` attrs not being concatenated onto the returned
derivation. Now it will be.
-rw-r--r--pkgs/development/ruby-modules/bundled-common/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index cd2f6f379efc5..3bb95521132b0 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -23,6 +23,7 @@
 , nativeBuildInputs ? []
 , buildInputs ? []
 , extraConfigPaths ? []
+, passthru ? {}
 , ...
 }@args:
 
@@ -182,7 +183,7 @@ let
             exit 1
           '';
         };
-    });
+    } // passthru);
   };
 
   basicEnv =