diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-07-01 15:27:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 15:27:23 +0200 |
| commit | 1f5a0b0135121ee677fe10a7267a53f90b9d6da9 (patch) | |
| tree | 14c582db9d08229e1f40c1c2e329e0c605bd8b1a /pkgs/stdenv/generic | |
| parent | 01e209af7890a6ab638ea9b219d603f40bccd8ce (diff) | |
| parent | 0c9fb905cbaf4bbc64ebe098aa42a1dbbc4149fd (diff) | |
| download | nixpkgs-1f5a0b0135121ee677fe10a7267a53f90b9d6da9.tar nixpkgs-1f5a0b0135121ee677fe10a7267a53f90b9d6da9.tar.gz nixpkgs-1f5a0b0135121ee677fe10a7267a53f90b9d6da9.tar.bz2 nixpkgs-1f5a0b0135121ee677fe10a7267a53f90b9d6da9.tar.lz nixpkgs-1f5a0b0135121ee677fe10a7267a53f90b9d6da9.tar.xz nixpkgs-1f5a0b0135121ee677fe10a7267a53f90b9d6da9.tar.zst nixpkgs-1f5a0b0135121ee677fe10a7267a53f90b9d6da9.zip | |
Merge pull request #239005 from Artturin/setorfunoverr
stdenv: let overrideAttrs accept attrset OR function
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 232ba2f8a8a..8af162da7f2 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; |