Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mpv: wrap LUA_CPATH and LUA_PATH environment variables #88472

Merged
merged 1 commit into from May 21, 2020

Conversation

@cript0nauta
Copy link
Contributor

cript0nauta commented May 21, 2020

Motivation for this change

mpv scripts were unable to import luasocket modules. Running mpv /dev/null --script=/tmp/path_to_script.lua with the following script:

-- test whether lua scripts can import luasocket modules
require("socket")
require("mime")
print("import successful")

failed with a Lua error: /tmp/script.lua:2: module 'socket' not found: error message.

Things done

Add LUA_CPATH LUA_PATH environment variables to the wrapped mpv binary.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
mpv uses lua without directly executing the "lua" binary, so prefixing
$PATH wasn't enough. Without this change, lua scripts were unable to
import luasocket.
@ofborg ofborg bot requested review from globin, fpletz, Ma27, AndersonTorres and tadeokondrak May 21, 2020
@AndersonTorres AndersonTorres changed the title mpv: fix lua path mpv: wrap LUA_CPATH and LUA_PATH environment variables May 21, 2020
@AndersonTorres AndersonTorres merged commit 45dad06 into NixOS:master May 21, 2020
17 checks passed
17 checks passed
editorconfig editorconfig
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a6dfaad"; rev="a6dfaad92241ff299131d49d71c53ca4e6661e12"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a6dfaad"; rev="a6dfaad92241ff299131d49d71c53ca4e6661e12"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a6dfaad"; rev="a6dfaad92241ff299131d49d71c53ca4e6661e12"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a6dfaad"; rev="a6dfaad92241ff299131d49d71c53ca4e6661e12"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a6dfaad"; rev="a6dfaad92241ff299131d49d71c53ca4e6661e12"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a6dfaad"; rev="a6dfaad92241ff299131d49d71c53ca4e6661e12"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a6dfaad"; rev="a6dfaad92241ff299131d49d71c53ca4e6661e12"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
mpv, mpv.passthru.tests on aarch64-linux Success
Details
mpv, mpv.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.