Unverified Commit d989747e authored by Zane van Iperen's avatar Zane van Iperen
Browse files

openrussian-cli: unbreak on darwin 

We got hit with a bad case of https://github.com/dumblob/mysql2sqlite/issues/75
parent 7c9a659c

pkgs/by-name/op/openrussian-cli/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/by-name/op/openrussian-cli/use-mawk.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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