diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 18:01:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 18:01:31 +0000 |
| commit | c68d98e9d41f96cf3d591f8d5a7abfdb2b292799 (patch) | |
| tree | be6df5adcc1528f56a1204acff4eaf2cfd1cefb6 /lib/customisation.nix | |
| parent | 68ba5fd2ed8be749cf1865ed9a71667dfda944a7 (diff) | |
| parent | 4a7eb88e55f80623bb3ea4968ff4600814016ffb (diff) | |
| download | nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.gz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.bz2 nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.lz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.xz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.zst nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.zip | |
Merge staging-next into staging
Diffstat (limited to 'lib/customisation.nix')
| -rw-r--r-- | lib/customisation.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index ec2513021f9f..5ef4f29e6f6a 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -69,8 +69,8 @@ rec { "<pkg>.overrideDerivation" to learn about `overrideDerivation` and caveats related to its use. */ - makeOverridable = f: origArgs: - let + makeOverridable = f: lib.setFunctionArgs + (origArgs: let result = f origArgs; # Creates a functor with the same arguments as f @@ -95,7 +95,8 @@ rec { lib.setFunctionArgs result (lib.functionArgs result) // { override = overrideArgs; } - else result; + else result) + (lib.functionArgs f); /* Call the package function in the file `fn` with the required |