From cb8398c8171a1b473f76da223bb3f91fd39a4347 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Oct 2021 09:14:28 +0800 Subject: [PATCH] pantheon.elementary-videos: 2.7.3 -> 2.8.0 --- .../apps/elementary-videos/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 0c06e7b24439..642f1c460b7f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -12,6 +12,7 @@ , gtk3 , granite , libgee +, libhandy , clutter-gst , clutter-gtk , gst_all_1 @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.7.3"; + version = "2.8.0"; repoName = "videos"; @@ -29,22 +30,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7"; - }; - - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/videos/pull/233 - (fetchpatch { - url = "https://github.com/elementary/videos/commit/19ba2a9148be09ea521d2e9ac29dede6b9c6fa07.patch"; - sha256 = "0ffp7ana98846xi7vxrzfg6dbs4yy28x2i4ky85mqs1gj6fjqin5"; - }) - ]; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-FFCtQ42LygfjowehwZcISWTfv8PBZTH0X8mPrpiG8Ug="; }; nativeBuildInputs = [ @@ -70,6 +56,7 @@ stdenv.mkDerivation rec { gstreamer gtk3 libgee + libhandy ]; postPatch = '' @@ -77,6 +64,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Video player and library app designed for elementary OS"; homepage = "https://github.com/elementary/videos";