colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.mysql-connector: Fix on darwin

Browse Source 
mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. This makes
the installation with nixpkgs fail. I suspect, that's because
stdenv.targetPlatform.darwinSdkVersion is (currently) set to 10.12.

The patch reverts d1e89fd3d7
This commit is contained in:
Alexander Ben Nasrallah 2021-07-20 10:37:27 +02:00
parent c584d0c421
commit 6ce6aae674
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch Normal file
View File

@ -0,0 +1,36 @@
From c5d32ef5d656b0aa4b2c1fc61c901d40bf2fb96a Mon Sep 17 00:00:00 2001
From: Alexander Ben Nasrallah <me@abn.sh>
Date: Mon, 19 Jul 2021 17:24:41 +0200
Subject: [PATCH] Revert "Fix MacOS wheels platform tag"
This reverts commit d1e89fd3d7391084cdf35b0806cb5d2a4b413654.
---
cpydist/__init__.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/cpydist/__init__.py b/cpydist/__init__.py
index 0e7f341..2619d7a 100644
--- a/cpydist/__init__.py
+++ b/cpydist/__init__.py
@@ -41,7 +41,7 @@ from distutils.command.install import install
from distutils.command.install_lib import install_lib
from distutils.core import Command
from distutils.dir_util import mkpath, remove_tree
-from distutils.sysconfig import get_config_vars, get_python_version
+from distutils.sysconfig import get_python_version
from distutils.version import LooseVersion
from subprocess import check_call, Popen, PIPE
@@ -57,9 +57,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py")
with open(version_py, "rb") as fp:
exec(compile(fp.read(), version_py, "exec"))
-if "MACOSX_DEPLOYMENT_TARGET" in get_config_vars():
- get_config_vars()["MACOSX_DEPLOYMENT_TARGET"] = "11.0"
-
COMMON_USER_OPTIONS = [
("byte-code-only", None,
"remove Python .py files; leave byte code .pyc only"),
--
2.31.1

9
pkgs/development/python-modules/mysql-connector/default.nix
View File

@ -13,6 +13,15 @@ in buildPythonPackage rec {
sha256 = "1zb5wf65rnpbk0lw31i4piy0bq09hqa62gx7bh241zc5310zccc7";
};
patches = [
# mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11.
# This makes the installation with nixpkgs fail. I suspect, that's
# because stdenv.targetPlatform.darwinSdkVersion is (currently) set to
# 10.12. The patch reverts
# https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654
./0001-Revert-Fix-MacOS-wheels-platform-tag.patch
];
propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
# Tests are failing (TODO: unknown reason)