summary refs log tree commit diff
path: root/pkgs/games/anki/default.nix
diff options
context:
space:
mode:
authorAlexey Lebedeff <binarin@binarin.ru>2018-12-01 11:05:28 +0100
committerAlexey Lebedeff <binarin@binarin.ru>2018-12-01 11:05:28 +0100
commit19bffeee70043b7e9f8f7287b632078c05996d35 (patch)
treee60b6bbee5f7f53d9b9d4f6a2a13c2a839bcaf78 /pkgs/games/anki/default.nix
parent8d61b9d079de1460d9e1e73f73174bea30fd324d (diff)
downloadnixpkgs-19bffeee70043b7e9f8f7287b632078c05996d35.tar
nixpkgs-19bffeee70043b7e9f8f7287b632078c05996d35.tar.gz
nixpkgs-19bffeee70043b7e9f8f7287b632078c05996d35.tar.bz2
nixpkgs-19bffeee70043b7e9f8f7287b632078c05996d35.tar.lz
nixpkgs-19bffeee70043b7e9f8f7287b632078c05996d35.tar.xz
nixpkgs-19bffeee70043b7e9f8f7287b632078c05996d35.tar.zst
nixpkgs-19bffeee70043b7e9f8f7287b632078c05996d35.zip
anki: Use `fetchpatch` for python compatibilty patch
Diffstat (limited to 'pkgs/games/anki/default.nix')
-rw-r--r--pkgs/games/anki/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index c73afdd0393..3f837886116 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -4,6 +4,7 @@
 , lib
 , python
 , fetchurl
+, fetchpatch
 , lame
 , mplayer
 , libpulseaudio
@@ -53,7 +54,16 @@ buildPythonApplication rec {
     patches = [
       # Disable updated version check.
       ./no-version-check.patch
-      ./python-3.7-compat.patch
+
+      # This is needed to fix python 3.7 compatibilty, where the
+      # behaviour of `re.escape()` was changed in a way that it no
+      # longer escapes `%`. This patch detects this difference at
+      # runtime and makes anki work with any python version.
+      # Upstream PR: https://github.com/dae/anki/pull/266
+      (fetchpatch {
+        url = "https://github.com/dae/anki/commit/3d69aa9ce454a151ba75deafd7de117af2c7307d.patch";
+        sha256 = "0kf9gajhy0wcajp24xfia71z6gn1mc4vl37svvq4sqbhj3gigd0h";
+      })
     ];
 
     buildPhase = ''