colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #161396 from vs49688/orfix

Browse Source
This commit is contained in:
Sandro 2022-03-15 20:00:44 +01:00 committed by GitHub
commit a31cb9033e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/misc/openrussian-cli/default.nix
View File

@ -1,6 +1,9 @@
{ stdenv, lib, fetchFromGitHub, gnumake, pkg-config, wget, unzip, gawk
, sqlite, which, luaPackages, installShellFiles, makeWrapper
, sqlite, which, lua, installShellFiles, makeWrapper
}:
let
luaEnv = lua.withPackages(p: with p; [ luasql-sqlite3 luautf8 ]);
in
stdenv.mkDerivation rec {
pname = "openrussian-cli";
version = "1.0.0";
@ -16,11 +19,11 @@ stdenv.mkDerivation rec {
gnumake pkg-config wget unzip gawk sqlite which installShellFiles makeWrapper
];
buildInputs = with luaPackages; [ lua luasql-sqlite3 luautf8 ];
buildInputs = [ luaEnv ];
makeFlags = [
"LUA=${luaPackages.lua}/bin/lua"
"LUAC=${luaPackages.lua}/bin/luac"
"LUA=${luaEnv}/bin/lua"
"LUAC=${luaEnv}/bin/luac"
];
dontConfigure = true;
@ -34,8 +37,8 @@ stdenv.mkDerivation rec {
cp openrussian $out/bin
wrapProgram $out/bin/openrussian \
--prefix LUA_PATH ';' "$LUA_PATH" \
--prefix LUA_CPATH ';' "$LUA_CPATH"
--prefix LUA_PATH ';' '${lua.pkgs.lib.genLuaPathAbsStr luaEnv}' \
--prefix LUA_CPATH ';' '${lua.pkgs.lib.genLuaCPathAbsStr luaEnv}'
runHook postInstall
'';

2
pkgs/top-level/all-packages.nix
View File

@ -8598,7 +8598,7 @@ with pkgs;
openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
openrussian-cli = callPackage ../misc/openrussian-cli {
luaPackages = lua53Packages;
lua = lua5_3;
};
opensbi = callPackage ../misc/opensbi { };