diff options
| author | Artturin <Artturin@artturin.com> | 2023-06-21 17:30:32 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-06-30 23:28:00 +0300 |
| commit | 0fdae315315686d180d924a7c33066fbc5b4c14d (patch) | |
| tree | c2d1f96710e183a3aa35e7a22bf8461196b51a72 /pkgs | |
| parent | 3cd360a2de66c1f17099b2edffdf1842c1266abd (diff) | |
| download | nixlib-0fdae315315686d180d924a7c33066fbc5b4c14d.tar nixlib-0fdae315315686d180d924a7c33066fbc5b4c14d.tar.gz nixlib-0fdae315315686d180d924a7c33066fbc5b4c14d.tar.bz2 nixlib-0fdae315315686d180d924a7c33066fbc5b4c14d.tar.lz nixlib-0fdae315315686d180d924a7c33066fbc5b4c14d.tar.xz nixlib-0fdae315315686d180d924a7c33066fbc5b4c14d.tar.zst nixlib-0fdae315315686d180d924a7c33066fbc5b4c14d.zip | |
stdenv: let overrideAttrs accept attrset OR function
Makes overrideAttrs usable in the same way that `override` can be used.
It allows the first argument of `overrideAttrs` to be either a function
or an attrset, instead of only a function:
hello.overrideAttrs (old: { postBuild = "echo hello"; })
hello.overrideAttrs { postBuild = "echo hello"; }
Previously only the first example was possible.
Co-authored-by: adisbladis <adisbladis@gmail.com>
Co-authored-by: matthewcroughan <matt@croughan.sh>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 | ||||
| -rw-r--r-- | pkgs/test/overriding.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 40ad357739b7..d3593b6e8092 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -41,7 +41,7 @@ let else x; in makeDerivationExtensible - (self: let super = rattrs self; in super // f self super); + (self: let super = rattrs self; in super // (if builtins.isFunction f0 || f0?__functor then f self super else f0)); finalPackage = mkDerivationSimple overrideAttrs args; diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix index edc1b27cf4f1..7838f637f313 100644 --- a/pkgs/test/overriding.nix +++ b/pkgs/test/overriding.nix @@ -21,6 +21,11 @@ let expr = repeatedOverrides.entangled.pname == "a-better-figlet-with-blackjack"; expected = true; }) + ({ + name = "overriding-using-only-attrset"; + expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname == "hello-overriden"; + expected = true; + }) ]; addEntangled = origOverrideAttrs: f: |