From 35d83c3f20c2ab893e5f9b5b58a4a87d6405ddf7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Aug 2022 16:58:39 +0000 Subject: [PATCH] =?UTF-8?q?gnome.totem:=2043.alpha=20=E2=86=92=2043.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Requires libx11 1.8 https://gitlab.gnome.org/GNOME/totem/-/compare/43.alpha...43.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/totem/default.nix | 27 +++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 1c3a44d63deb..fa979752ddae 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , gettext @@ -30,13 +32,32 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "43.alpha"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9pKUwVa0vZU+AQBdY+M+RWOTX5kmMDj65LxNlMEOuII="; + sha256 = "qkgMw4JT7Y07M0/qfj550hQ/J6N27dXbZjvIccKGSHA="; }; + patches = [ + # Lower X11 dependency version since we do not have it. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/140d9eea70c3101ef3234abb4de5974cb84b13db.patch"; + sha256 = "ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8="; + revert = true; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/2610b4536f73493587e4a5a38e01c9961fcabb96.patch"; + sha256 = "nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38="; + revert = true; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/5b871aee5292f25bbf39dca18045732e979e7a68.patch"; + sha256 = "LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg="; + revert = true; + }) + ]; + nativeBuildInputs = [ meson ninja