Unverified Commit b74d956e authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #263916 from vs49688/openrussian 

openrussian-cli: fix build & misc cleanups
parents da1923d1 d989747e

pkgs/misc/openrussian-cli/default.nix→pkgs/by-name/op/openrussian-cli/package.nix

+86 −0
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, pkg-config, wget, unzip

, sqlite, which, lua, installShellFiles, makeWrapper

{ stdenv

, lib

, fetchFromGitHub

, fetchpatch

, pkg-config

, wget

, unzip

, mawk

, sqlite

, which

, lua5_3

, installShellFiles

, makeWrapper

}:

let

  luaEnv = lua.withPackages(p: with p; [ luasql-sqlite3 luautf8 ]);

  luaEnv = lua5_3.withPackages (p: with p; [ luasql-sqlite3 luautf8 ]);

in

stdenv.mkDerivation rec {

  pname = "openrussian-cli";
@@ -12,11 +23,27 @@ stdenv.mkDerivation rec { 
    owner = "rhaberkorn";

    repo = "openrussian-cli";

    rev = version;

    sha256  = "1ria7s7dpqip2wdwn35wmkry84g8ghdqnxc9cbxzzq63vl6pgvcn";

    hash = "sha256-lu13Dd3D4P/7Yol1ixt86BHk86y8DMsbFzfi244+KuY=";

  };



  patches = [

    (fetchpatch {

      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 = [

    pkg-config wget unzip sqlite which installShellFiles makeWrapper

    pkg-config

    wget

    unzip

    sqlite

    which

    installShellFiles

    makeWrapper

    mawk

  ];



  buildInputs = [ luaEnv ];
@@ -37,8 +64,8 @@ stdenv.mkDerivation rec { 
    cp openrussian $out/bin



    wrapProgram $out/bin/openrussian \

      --prefix LUA_PATH ';' '${lua.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \

      --prefix LUA_CPATH ';' '${lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv}'

      --prefix LUA_PATH ';' '${lua5_3.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \

      --prefix LUA_CPATH ';' '${lua5_3.pkgs.luaLib.genLuaCPathAbsStr luaEnv}'



    runHook postInstall

  '';

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

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -11647,10 +11647,6 @@ with pkgs; 














  openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };



























  openrussian-cli = callPackage ../misc/openrussian-cli {













    lua = lua5_3;













  };



























  opensbi = callPackage ../misc/opensbi { };





























  opensc = callPackage ../tools/security/opensc {