about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Rendle-Short <chris@killred.net>2019-06-16 07:57:09 +1000
committerChris Rendle-Short <chris@killred.net>2019-06-16 13:01:02 +1000
commit28070039aea7972f19c2264c1d8406e6a754165f (patch)
treecc5c65acc269ad76fb59e7a3ca1f1288d0e8d715
parent46ce40ba6a6f03d02d9ab7cad984c62baf488d6e (diff)
downloadnixlib-28070039aea7972f19c2264c1d8406e6a754165f.tar
nixlib-28070039aea7972f19c2264c1d8406e6a754165f.tar.gz
nixlib-28070039aea7972f19c2264c1d8406e6a754165f.tar.bz2
nixlib-28070039aea7972f19c2264c1d8406e6a754165f.tar.lz
nixlib-28070039aea7972f19c2264c1d8406e6a754165f.tar.xz
nixlib-28070039aea7972f19c2264c1d8406e6a754165f.tar.zst
nixlib-28070039aea7972f19c2264c1d8406e6a754165f.zip
gnome-mpv: 0.13 -> 0.16
-rw-r--r--pkgs/applications/video/gnome-mpv/appdata-validate.patch11
-rw-r--r--pkgs/applications/video/gnome-mpv/default.nix19
2 files changed, 21 insertions, 9 deletions
diff --git a/pkgs/applications/video/gnome-mpv/appdata-validate.patch b/pkgs/applications/video/gnome-mpv/appdata-validate.patch
new file mode 100644
index 000000000000..45721d2b72e9
--- /dev/null
+++ b/pkgs/applications/video/gnome-mpv/appdata-validate.patch
@@ -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)
diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix
index 75a299d46c7d..e734922b1c78 100644
--- a/pkgs/applications/video/gnome-mpv/default.nix
+++ b/pkgs/applications/video/gnome-mpv/default.nix
@@ -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;
   };