diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-06-16 12:15:10 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-06-16 12:15:10 +0200 |
| commit | 9e480c5dfa1909c58f80ab855a3d5a267aad83c1 (patch) | |
| tree | db43ffa5afdd9e4dc9f2b570d9660265d7d6df32 | |
| parent | ca51fbb3d6def9d9a10e63b02803107c148c1054 (diff) | |
| download | nixlib-9e480c5dfa1909c58f80ab855a3d5a267aad83c1.tar nixlib-9e480c5dfa1909c58f80ab855a3d5a267aad83c1.tar.gz nixlib-9e480c5dfa1909c58f80ab855a3d5a267aad83c1.tar.bz2 nixlib-9e480c5dfa1909c58f80ab855a3d5a267aad83c1.tar.lz nixlib-9e480c5dfa1909c58f80ab855a3d5a267aad83c1.tar.xz nixlib-9e480c5dfa1909c58f80ab855a3d5a267aad83c1.tar.zst nixlib-9e480c5dfa1909c58f80ab855a3d5a267aad83c1.zip | |
gnome-mpv: use external patch
| -rw-r--r-- | pkgs/applications/video/gnome-mpv/appdata-validate.patch | 11 | ||||
| -rw-r--r-- | pkgs/applications/video/gnome-mpv/default.nix | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/applications/video/gnome-mpv/appdata-validate.patch b/pkgs/applications/video/gnome-mpv/appdata-validate.patch deleted file mode 100644 index 45721d2b72e9..000000000000 --- a/pkgs/applications/video/gnome-mpv/appdata-validate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 e734922b1c78..a04eebfcc407 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3 +{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, python3 , gettext, pkgconfig, desktop-file-utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: @@ -18,7 +18,12 @@ stdenv.mkDerivation rec { buildInputs = [ epoxy glib gtk3 mpv ]; patches = [ - ./appdata-validate.patch + # 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 = '' |