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

Merge pull request #54315 from adisbladis/mpv-mujs

Browse Source 
mpv: Add javascript support
This commit is contained in:
adisbladis 2019-01-19 13:37:49 +00:00 committed by GitHub
commit 2031aaff07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/mpv/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, makeWrapper { stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4 , docutils, perl, pkgconfig, python3, which, ffmpeg_4
, freefont_ttf, freetype, libass, libpthreadstubs , freefont_ttf, freetype, libass, libpthreadstubs, mujs
, lua, luasocket, libuchardet, libiconv ? null, darwin , lua, luasocket, libuchardet, libiconv ? null, darwin
, waylandSupport ? false , waylandSupport ? false
@ -139,7 +139,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ffmpeg_4 freetype libass libpthreadstubs ffmpeg_4 freetype libass libpthreadstubs
lua luasocket libuchardet lua luasocket libuchardet mujs
] ++ optional alsaSupport alsaLib ] ++ optional alsaSupport alsaLib
++ optional archiveSupport libarchive ++ optional archiveSupport libarchive
++ optional bluraySupport libbluray ++ optional bluraySupport libbluray

14
pkgs/development/interpreters/mujs/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchgit, clang }: { stdenv, fetchurl, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mujs-2017-01-24"; name = "mujs-${version}";
version = "1.0.5";
src = fetchgit { src = fetchurl {
url = git://git.ghostscript.com/mujs.git; url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
rev = "4006739a28367c708dea19aeb19b8a1a9326ce08"; sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l";
sha256 = "0wvjl8lkh0ga6fkmxgjqq77yagncbv1bdy6hpnxq31x3mkwn1s51";
}; };
buildInputs = [ clang ]; buildInputs = [ readline ];
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];