Unverified Commit f8323a26 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #241328 from Artturin/setorfunoverrfix

stdenv: fix overriding with attrset when finalAttrs isn't used
parents 47c98868 42c94d06
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ let
                f0 self super
              else x;
        in
          makeDerivationExtensible (self: attrs // f self attrs))
          makeDerivationExtensible (self: attrs // (if builtins.isFunction f0 || f0?__functor then f self attrs else f0)))
      attrs;

  mkDerivationSimple = overrideAttrs:
+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ let
        expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname == "hello-overriden";
        expected = true;
      })
      ({
        name = "overriding-using-only-attrset-no-final-attrs";
        expr = ((stdenvNoCC.mkDerivation { pname = "hello-no-final-attrs"; }).overrideAttrs { pname = "hello-no-final-attrs-overridden"; }).pname == "hello-no-final-attrs-overridden";
        expected = true;
      })
    ];

  addEntangled = origOverrideAttrs: f: