From 72e258ac341e9e91314a2738b7577273354a386b Mon Sep 17 00:00:00 2001 From: Carsten Kragelund Date: Fri, 16 Jun 2023 06:39:14 +0200 Subject: [PATCH] bulding on macos --- pkgs/python-packages/skia-pathops.nix | 2 +- pkgs/python-packages/ttfautohint-py.nix | 4 ++-- pkgs/rec-mono-nyx/default.nix | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/python-packages/skia-pathops.nix b/pkgs/python-packages/skia-pathops.nix index e2a1c71..0b524f7 100644 --- a/pkgs/python-packages/skia-pathops.nix +++ b/pkgs/python-packages/skia-pathops.nix @@ -23,7 +23,7 @@ nativeBuildInputs = [ pkgs.python39.pkgs.cython pkgs.ninja pkgs.python39.pkgs.setuptools-scm ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.xcodebuild ]; - buildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.ApplicationServices pkgs.OpenGL ]; + buildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices pkgs.darwin.apple_sdk.frameworks.OpenGL ]; propagatedBuildInputs = [ pkgs.python39.pkgs.setuptools ]; diff --git a/pkgs/python-packages/ttfautohint-py.nix b/pkgs/python-packages/ttfautohint-py.nix index a846f9d..e16b539 100644 --- a/pkgs/python-packages/ttfautohint-py.nix +++ b/pkgs/python-packages/ttfautohint-py.nix @@ -2,8 +2,8 @@ pname = "ttfautohint-py"; version = "0.5.1"; src = pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/95/13/fa29859804685619c0788a92a78ba624879ba618e67f25ffe30ca51bfb04/ttfautohint_py-0.5.1-py2.py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "sha256-XGX+L9PuFtaCARacckE+cBMNn50LklifkSLZ9yqY0JM="; + url = if pkgs.stdenv.isLinux then "https://files.pythonhosted.org/packages/95/13/fa29859804685619c0788a92a78ba624879ba618e67f25ffe30ca51bfb04/ttfautohint_py-0.5.1-py2.py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" else "https://files.pythonhosted.org/packages/2c/37/1e1500aee15ce25c20e705d9ee34f4e9c5d8118050db973bca777139c3e7/ttfautohint_py-0.5.1-py2.py3-none-macosx_10_9_universal2.whl"; + sha256 = if pkgs.stdenv.isLinux then "sha256-XGX+L9PuFtaCARacckE+cBMNn50LklifkSLZ9yqY0JM=" else "sha256-EIKQezMRL3c0RJ9kyknVwyJaTGpycDQ1OIXllrHgoLA="; }; format = "wheel"; passthru = { }; diff --git a/pkgs/rec-mono-nyx/default.nix b/pkgs/rec-mono-nyx/default.nix index 267346d..cce5e8a 100644 --- a/pkgs/rec-mono-nyx/default.nix +++ b/pkgs/rec-mono-nyx/default.nix @@ -72,7 +72,6 @@ nurPs.ttfautohint-py ps.setuptools ])) - pkgs.ttfautohint ]; outputs = [ "out" ];