Unverified Commit 4fbe10f5 authored by Randy Eckenrode's avatar Randy Eckenrode Committed by GitHub
Browse files

Don't trigger the evaluation of apple-sdk in Linux stdenv (#409574)

parents efa98030 5953ae56

pkgs/build-support/bintools-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ stdenvNoCC.mkDerivation { 
        darwinMinVersionVariable

        ;

    }

    // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {

    // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {

      # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.

      fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;

    };

pkgs/build-support/cc-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ stdenvNoCC.mkDerivation { 
      # These will become empty strings when not targeting Darwin.

      inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;

    }

    // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {

    // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {

      # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.

      fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;

    };