Commit b9275165 authored by Niklas Korz's avatar Niklas Korz
Browse files

pypy: remove explicit darwin minimum SDK 

PyPy sets an explicit minimum SDK version for darwin that is much older
than what we we default to on nixpkgs (currently 14.0).
Simply removing the explicit flag makes it use our default instead.

This fixes a build failure where PyPy tries to access APIs that are not
available in the macOS SDK it is targetting.
This is technically not relevant for upstream as this is an opt-in
warning which we have recently enabled by default (as error) on
nixpkgs, but they too should bump the minimum target to at least 10.15
from their current target of 10.13.
parent 6f5a1ec9

pkgs/development/interpreters/python/pypy/darwin_version_min.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
diff --git a/rpython/translator/platform/darwin.py b/rpython/translator/platform/darwin.py

index 8c824a8459..f407fb6c07 100644

--- a/rpython/translator/platform/darwin.py

+++ b/rpython/translator/platform/darwin.py

@@ -26,12 +26,12 @@ class Darwin(posix.BasePosix):

     standalone_only = ('-mdynamic-no-pic',)

     shared_only = ()

 

-    link_flags = (DARWIN_VERSION_MIN,)

+    link_flags = ()

     cflags = ('-O3',

               '-fomit-frame-pointer',

               # The parser turns 'const char *const *includes' into 'const const char **includes'

               '-Wno-duplicate-decl-specifier',

-              DARWIN_VERSION_MIN,)

+              )

 

     so_ext = 'dylib'

     DEFAULT_CC = 'clang'

pkgs/development/interpreters/python/pypy/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -171,6 +171,11 @@ stdenv.mkDerivation rec { 
      inherit (sqlite) out dev;

      libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";

    })



    # PyPy sets an explicit minimum SDK version for darwin that is much older

    # than what we default to on nixpkgs.

    # Simply removing the explicit flag makes it use our default instead.

    ./darwin_version_min.patch

  ];



  postPatch = ''