diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix new file mode 100644 index 000000000000..d1a9b64d711b --- /dev/null +++ b/pkgs/applications/video/celluloid/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix deleted file mode 100644 index a04eebfcc407..000000000000 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3dbd2efd55b..a7bf2722341b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29ac576926a2..cab9cca8bc10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18602,7 +18602,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;