Skip to content

Commit

Permalink
Merge pull request #67256 from jtojnar/celluloid-0.17
Browse files Browse the repository at this point in the history
celluloid: 0.16 → 0.17
  • Loading branch information
jtojnar committed Aug 22, 2019
2 parents 7305796 + 991c1eb commit 0c20b6a
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 49 deletions.
64 changes: 64 additions & 0 deletions pkgs/applications/video/celluloid/default.nix
Original file line number Diff line number Diff line change
@@ -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;
};
}
48 changes: 0 additions & 48 deletions pkgs/applications/video/gnome-mpv/default.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0c20b6a

Please sign in to comment.