diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-15 20:00:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 20:00:44 +0100 |
| commit | a31cb9033e20a048e816e6e864dab23474b0f893 (patch) | |
| tree | fa75764a2f392d2d792e7be5abc2ae8e92d5dd29 | |
| parent | 93810bccc83d7596695c917c494729e3fb669906 (diff) | |
| parent | 3c7e3a328ca8d537af1327e2b14db85e22a5b0eb (diff) | |
| download | nixlib-a31cb9033e20a048e816e6e864dab23474b0f893.tar nixlib-a31cb9033e20a048e816e6e864dab23474b0f893.tar.gz nixlib-a31cb9033e20a048e816e6e864dab23474b0f893.tar.bz2 nixlib-a31cb9033e20a048e816e6e864dab23474b0f893.tar.lz nixlib-a31cb9033e20a048e816e6e864dab23474b0f893.tar.xz nixlib-a31cb9033e20a048e816e6e864dab23474b0f893.tar.zst nixlib-a31cb9033e20a048e816e6e864dab23474b0f893.zip | |
Merge pull request #161396 from vs49688/orfix
| -rw-r--r-- | pkgs/misc/openrussian-cli/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index 24c0b6bece78..4f30fd918963 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cc0e2de05cd..66e925793c32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |