Merge pull request #67256 from jtojnar/celluloid-0.17

celluloid: 0.16 → 0.17
This commit is contained in:
Jan Tojnar 2019-08-22 20:23:12 +02:00 committed by GitHub
commit 0c20b6a9df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 66 additions and 49 deletions

View File

@ -0,0 +1,64 @@
{ stdenv
, fetchFromGitHub
, meson
, ninja
, python3
, gettext
, pkgconfig
, desktop-file-utils
, wrapGAppsHook
, appstream-glib
, epoxy
, glib
, gtk3
, mpv
}:
stdenv.mkDerivation rec {
pname = "celluloid";
version = "0.17";
src = fetchFromGitHub {
owner = "celluloid-player";
repo = "celluloid";
rev = "v${version}";
sha256 = "0pnxjv6n2q6igxdr8wzbahcj7vccw4nfjdk8fjdnaivf2lyrpv2d";
};
nativeBuildInputs = [
meson
ninja
python3
appstream-glib
gettext
pkgconfig
desktop-file-utils
wrapGAppsHook
];
buildInputs = [
epoxy
glib
gtk3
mpv
];
postPatch = ''
patchShebangs meson-post-install.py src/generate-authors.py
sed -i '/gtk-update-icon-cache/s/^/#/' meson-post-install.py
'';
doCheck = true;
meta = with stdenv.lib; {
description = "Simple GTK+ frontend for the mpv video player";
longDescription = ''
GNOME MPV interacts with mpv via the client API exported by libmpv,
allowing access to mpv's powerful playback capabilities through an
easy-to-use user interface.
'';
homepage = "https://github.com/celluloid-player/celluloid";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

View File

@ -1,48 +0,0 @@
{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, python3
, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook
, appstream-glib, epoxy, glib, gtk3, mpv
}:
stdenv.mkDerivation rec {
pname = "gnome-mpv";
version = "0.16";
src = fetchFromGitHub {
owner = "celluloid-player";
repo = "celluloid";
rev = "v${version}";
sha256 = "1fj5mr1dwd07jpnigk7z85xdm6yaf7spbvf60aj3mz12m05b1b2w";
};
nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
buildInputs = [ epoxy glib gtk3 mpv ];
patches = [
# fix appstream validation in sandbox
# https://github.com/celluloid-player/celluloid/pull/437
(fetchpatch {
url = https://github.com/celluloid-player/celluloid/commit/5a0b2e892bb715278d309c859a7e521d64433d85.patch;
sha256 = "0naci8lr6128yilal39h46yvq9x3la7g7fhvr5xlwyh30iqrbm3i";
})
];
postPatch = ''
patchShebangs meson_post_install.py
patchShebangs src/generate_authors.py
sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
'';
doCheck = true;
meta = with stdenv.lib; {
description = "Simple GTK+ frontend for the mpv video player";
longDescription = ''
GNOME MPV interacts with mpv via the client API exported by libmpv,
allowing access to mpv's powerful playback capabilities through an
easy-to-use user interface.
'';
homepage = "https://github.com/celluloid-player/celluloid";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

View File

@ -111,6 +111,7 @@ mapAliases ({
gettextWithExpat = gettext; # 2016-02-19
git-hub = gitAndTools.git-hub; # added 2016-04-29
glib_networking = glib-networking; # added 2018-02-25
gnome-mpv = celluloid; # added 2019-08-22
gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25

View File

@ -18629,7 +18629,7 @@ in
gnomecast = callPackage ../applications/video/gnomecast { };
gnome-mpv = callPackage ../applications/video/gnome-mpv { };
celluloid = callPackage ../applications/video/celluloid { };
gnome-recipes = callPackage ../applications/misc/gnome-recipes {
inherit (gnome3) gnome-online-accounts gnome-autoar;