diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 2b23ef7b8c76..7dfd00db25f2 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -17,8 +17,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests audioread ]; - patches = [ ./pyacoustid-py3.patch ]; - postPatch = '' sed -i \ -e '/^FPCALC_COMMAND *=/s|=.*|= "${pkgs.chromaprint}/bin/fpcalc"|' \ diff --git a/pkgs/development/python-modules/pyacoustid/pyacoustid-py3.patch b/pkgs/development/python-modules/pyacoustid/pyacoustid-py3.patch deleted file mode 100644 index f79b35fd345e..000000000000 --- a/pkgs/development/python-modules/pyacoustid/pyacoustid-py3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 19209469a709ec0914f82c9de23137e360e5e804 Mon Sep 17 00:00:00 2001 -From: Simon Chopin -Date: Mon, 29 Sep 2014 10:38:20 +0200 -Subject: [PATCH] Explicit the UTF-8 encoding also when installing using Python - 3 - -If the locale isn't UTF-8, or for some reason Python doesn't pick up on -it, it will try to decode using ASCII, which will of course cause -mayhem, crash and despair. - -This patch will be shipped with the Debian package 1.1.0-1 ---- - setup.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index eafe5ea..0732fe3 100644 ---- a/setup.py -+++ b/setup.py -@@ -18,9 +18,10 @@ - - def _read(fn): - path = os.path.join(os.path.dirname(__file__), fn) -- data = open(path).read() - if sys.version_info[0] < 3: -- data = data.decode('utf8') -+ data = open(path).read().decode('utf8') -+ else: -+ data = open(path, encoding='utf8').read() - # Special case some Unicode characters; PyPI seems to only like ASCII. - data = data.replace(u'\xe1', u'a') - data = data.replace(u'\u0161', u's')