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

Merge pull request #297711 from hercules-ci/rename-adapters-finalAttrs 

pkgs/stdenv/adapters.nix: Rename internal name
parents 4a1d371d 8da01484

pkgs/stdenv/adapters.nix

+3 −3
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ rec { 
    # extraBuildInputs are dropped in cross.nix, but darwin still needs them

    extraBuildInputs = [ pkgs.buildPackages.darwin.CF ];

    mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args:

    (mkDerivationSuper args).overrideAttrs (finalAttrs: {

      NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "")

    (mkDerivationSuper args).overrideAttrs (prevAttrs: {

      NIX_CFLAGS_LINK = toString (prevAttrs.NIX_CFLAGS_LINK or "")

        + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc";

      nativeBuildInputs = (finalAttrs.nativeBuildInputs or [])

      nativeBuildInputs = (prevAttrs.nativeBuildInputs or [])

        ++ lib.optionals stdenv.hasCC [

          (pkgs.buildPackages.makeSetupHook {

            name = "darwin-portable-libSystem-hook";