openrussian-cli: unbreak on darwin
We got hit with a bad case of https://github.com/dumblob/mysql2sqlite/issues/75
This commit is contained in:
parent
7c9a659c85
commit
d989747e0c
2 changed files with 17 additions and 1 deletions
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
13
pkgs/by-name/op/openrussian-cli/use-mawk.patch
Normal file
13
pkgs/by-name/op/openrussian-cli/use-mawk.patch
Normal file
|
@ -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
|
Loading…
Reference in a new issue