From 36002dd59073bc33b9cc4f73365c0a590c5e5cbc Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 23 Sep 2022 14:15:26 -0700 Subject: [PATCH 1/2] python310Packages.opuslib: nit: use hash property --- pkgs/development/python-modules/opuslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index 7db467f26d50..79583ee926f6 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "orion-labs"; - repo = "opuslib"; + repo = pname; rev = "92109c528f9f6c550df5e5325ca0fcd4f86b0909"; - sha256 = "0kd37wimwd1g6c0w5hq2hiiljgbi1zg3rk5prval086khkzq469p"; + hash = "sha256-NxmC/4TTIEDVzrfMPN4PcT1JY4QCw8IBMy80XiM/o00="; }; patches = [ From 4aedfa3fc19bf75744fc3d2e57e3efa165ba88ce Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 23 Sep 2022 14:18:29 -0700 Subject: [PATCH 2/2] python310Packages.opuslib: fix on aarch64-darwin Pull in patch that fixes calling variadic functions on aarch64-darwin. --- pkgs/development/python-modules/opuslib/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index 79583ee926f6..a9c33f5abab4 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchFromGitHub, + fetchpatch, isPy27, libopus, nose, @@ -21,6 +22,12 @@ buildPythonPackage rec { }; patches = [ + # https://github.com/orion-labs/opuslib/pull/22 + (fetchpatch { + name = "fix-variadic-functions-on-aarch64-darwin.patch"; + url = "https://github.com/orion-labs/opuslib/commit/8aee916e4da4b3183d49cff5a986dc2408076d8d.patch"; + hash = "sha256-oa1HCFHNS3ejzSf0jxv9NueUKOZgdCtpv+xTrjYW5os="; + }) (substituteAll { src = ./opuslib-paths.patch; opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}";