Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 856d601b64f3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca51fbb3d6de
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 16, 2019

  1. gnome-mpv: 0.13 -> 0.16

    @lightbulbjim
    lightbulbjim committed Jun 16, 2019
    Copy the full SHA
    2807003 View commit details

  2. Merge pull request #63179 from lightbulbjim/gnome-mpv-update 

    gnome-mpv: 0.13 -> 0.16
    @jtojnar
    jtojnar authored Jun 16, 2019
    Copy the full SHA
    ca51fbb View commit details
Showing with 21 additions and 9 deletions.
  1. +11 −0 pkgs/applications/video/gnome-mpv/appdata-validate.patch
  2. +10 −9 pkgs/applications/video/gnome-mpv/default.nix
11 changes: 11 additions & 0 deletions pkgs/applications/video/gnome-mpv/appdata-validate.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/data/meson.build
+++ b/data/meson.build
@@ -43,7 +43,7 @@ configure_file(

appstream_util = find_program('appstream-util', required: false)
if appstream_util.found()
- test('Validate appstream file', appstream_util, args: ['validate', appdata])
+ test('Validate appstream file', appstream_util, args: ['validate', '--nonet', appdata])
endif

desktop_file_validate = find_program('desktop-file-validate', required: false)
19 changes: 10 additions & 9 deletions pkgs/applications/video/gnome-mpv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,21 +4,22 @@
}:

stdenv.mkDerivation rec {
name = "gnome-mpv-${version}";
version = "0.13";
pname = "gnome-mpv";
version = "0.16";

src = fetchFromGitHub {
owner = "gnome-mpv";
repo = "gnome-mpv";
rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata
# rev = "v${version}";
sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4";
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 ];

enableParallelBuilding = true;
patches = [
./appdata-validate.patch
];

postPatch = ''
patchShebangs meson_post_install.py
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
allowing access to mpv's powerful playback capabilities through an
easy-to-use user interface.
'';
homepage = https://github.com/gnome-mpv/gnome-mpv;
homepage = "https://github.com/celluloid-player/celluloid";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};