diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 15:09:53 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 15:09:53 +0100 |
commit | 6705f30e2c287ac5a5d6e775f08ad981eb292620 (patch) | |
tree | 648da4fb26300f7c8d993bc24baa355f33b06c90 /pkgs/applications/video | |
parent | 2b04026a8ad80e8e3d65a721cdc1d83784474b35 (diff) | |
parent | ba3a792435ee13269d1da5997581454145e2d626 (diff) | |
download | nixlib-6705f30e2c287ac5a5d6e775f08ad981eb292620.tar nixlib-6705f30e2c287ac5a5d6e775f08ad981eb292620.tar.gz nixlib-6705f30e2c287ac5a5d6e775f08ad981eb292620.tar.bz2 nixlib-6705f30e2c287ac5a5d6e775f08ad981eb292620.tar.lz nixlib-6705f30e2c287ac5a5d6e775f08ad981eb292620.tar.xz nixlib-6705f30e2c287ac5a5d6e775f08ad981eb292620.tar.zst nixlib-6705f30e2c287ac5a5d6e775f08ad981eb292620.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/gnome-mpv/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index c93510cb1a70..2f073d1731dc 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchurl -, intltool, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitHub, meson, ninja +, gettext, pkgconfig, desktop_file_utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: stdenv.mkDerivation rec { name = "gnome-mpv-${version}"; - version = "0.9"; + version = "0.13"; - src = fetchurl { - sha256 = "06pgxl6f3kkgxv8nlmyl7gy3pg55sqf8vgr8m6426mlpm4p3qdn0"; - url = "https://github.com/gnome-mpv/gnome-mpv/releases/download/v${version}/${name}.tar.xz"; + src = fetchFromGitHub { + owner = "gnome-mpv"; + repo = "gnome-mpv"; + rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata + # rev = "v${version}"; + sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; }; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ appstream-glib epoxy glib.dev gtk3 mpv ]; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop_file_utils wrapGAppsHook ]; + buildInputs = [ epoxy glib gtk3 mpv ]; enableParallelBuilding = true; + postPatch = '' + patchShebangs . + sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py + ''; + doCheck = true; + checkPhase = "meson test"; meta = with stdenv.lib; { description = "Simple GTK+ frontend for the mpv video player"; |