BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mpvScripts.mpris: use patch sent upstream for make DESTDIR=

Browse source 
Make sure mpris.so is stripped.
mpv-with-scripts: use a standard location for scripts in $out.
mpvScripts.convert: install to the new location of mpv scripts.
Replaced gobject-introspection dependency with glib.
This commit is contained in:
Doron Behar 2020-05-03 21:05:15 +03:00
parent f388ca8ac8
commit b0ac6a009b
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/video/mpv/scripts/convert.nix
View file

@ -2,7 +2,8 @@
, yad, mkvtoolnix-cli, libnotify }: , yad, mkvtoolnix-cli, libnotify }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mpv-convert-script-2016-03-18.lua"; pname = "mpv-convert-script";
version = "2016-03-18";
src = fetchgit { src = fetchgit {
url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0";
rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d";
@ -24,8 +25,10 @@ stdenv.mkDerivation {
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''
cp convert_script.lua $out mkdir -p $out/share/mpv/scripts
cp convert_script.lua $out/share/mpv/scripts
''; '';
passthru.scriptName = "convert_script.lua";
meta = { meta = {
description = "Convert parts of a video while you are watching it in mpv"; description = "Convert parts of a video while you are watching it in mpv";

22
pkgs/applications/video/mpv/scripts/mpris.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, gobject-introspection, mpv }: { stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpv-mpris-${version}.so"; pname = "mpv-mpris";
version = "0.5"; version = "0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -10,14 +10,24 @@ stdenv.mkDerivation rec {
rev = version; rev = version;
sha256 = "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk"; sha256 = "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk";
}; };
patches = [
# Enables to "make SCRIPTS_DIR=... install" https://github.com/hoyon/mpv-mpris/pull/38
(fetchpatch {
url = "https://github.com/hoyon/mpv-mpris/commit/f1482350868bf20e4575f923943ec998469b255e.patch";
sha256 = "1lqy867wpmj6hv3zgi6g679a7x3dv5skpw24hwd05b28galnyd4l";
})
];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gobject-introspection mpv ]; buildInputs = [ glib mpv ];
installPhase = '' installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ];
cp mpris.so $out
''; # Otherwise, the shared object isn't `strip`ped. See:
# https://discourse.nixos.org/t/debug-why-a-derivation-has-a-reference-to-gcc/7009
stripDebugList = [ "share/mpv/scripts" ];
passthru.scriptName = "mpris.so";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MPRIS plugin for mpv"; description = "MPRIS plugin for mpv";

2
pkgs/applications/video/mpv/wrapper.nix
View file

@ -9,6 +9,6 @@ symlinkJoin {
postBuild = '' postBuild = ''
wrapProgram $out/bin/mpv \ wrapProgram $out/bin/mpv \
--add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=" + x) scripts}" --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=${x}/share/mpv/scripts/${x.scriptName}") scripts}"
''; '';
} }