diff options
| author | Zane van Iperen <zane@zanevaniperen.com> | 2023-11-17 03:47:37 +1000 |
|---|---|---|
| committer | Zane van Iperen <zane@zanevaniperen.com> | 2023-11-17 03:47:37 +1000 |
| commit | d989747e0c73002228a9d89a35964732149d6166 (patch) | |
| tree | 8a3410b7398255c7ad8b53409e00ec61646d0eac | |
| parent | 7c9a659c8540cfeb16e2aee4c3d6b43f55450b46 (diff) | |
openrussian-cli: unbreak on darwin
We got hit with a bad case of https://github.com/dumblob/mysql2sqlite/issues/75
| -rw-r--r-- | pkgs/by-name/op/openrussian-cli/package.nix | 5 | ||||
| -rw-r--r-- | pkgs/by-name/op/openrussian-cli/use-mawk.patch | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/by-name/op/openrussian-cli/package.nix b/pkgs/by-name/op/openrussian-cli/package.nix index 2078d2dad8445..e196507f67e34 100644 --- a/pkgs/by-name/op/openrussian-cli/package.nix +++ b/pkgs/by-name/op/openrussian-cli/package.nix @@ -5,6 +5,7 @@ , pkg-config , wget , unzip +, mawk , sqlite , which , lua5_3 @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { url = "https://github.com/rhaberkorn/openrussian-cli/commit/984e555acbadbd1aed7df17ab53e2c586a2f8f68.patch"; hash = "sha256-/z4YrEeuejtCtwiFXksFREwgQoWvtI0Kl9w75KDQfF8="; }) + # Work around https://github.com/dumblob/mysql2sqlite/issues/75 + ./use-mawk.patch ]; nativeBuildInputs = [ @@ -40,6 +43,7 @@ stdenv.mkDerivation rec { which installShellFiles makeWrapper + mawk ]; buildInputs = [ luaEnv ]; @@ -77,7 +81,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; maintainers = with maintainers; [ zane ]; mainProgram = "openrussian"; - broken = stdenv.isDarwin; # FIXME: The mysql2sqlite script hangs on Darwin. platforms = platforms.unix; }; } diff --git a/pkgs/by-name/op/openrussian-cli/use-mawk.patch b/pkgs/by-name/op/openrussian-cli/use-mawk.patch new file mode 100644 index 0000000000000..d0cfa814bae3c --- /dev/null +++ b/pkgs/by-name/op/openrussian-cli/use-mawk.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 8fe3880..281ce2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,7 @@ openrussian-sql.zip: + + openrussian-sqlite3.db : openrussian-sql.zip mysql2sqlite postprocess.sql + $(RM) $@ +- unzip -p $< openrussian.sql | awk -f ./mysql2sqlite - | sqlite3 $@ ++ unzip -p $< openrussian.sql | mawk -f ./mysql2sqlite - | sqlite3 $@ + sqlite3 $@ -batch <postprocess.sql + + # Try to generate all possible pages |