From e0eb0416f93b669224f475984c4a30e92c3d97cf Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 8 Apr 2022 21:20:23 +0800
Subject: [PATCH] =?UTF-8?q?gnome.ghex:=204.beta.1=20=E2=86=92=2042.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/ghex/-/compare/4.beta.1...42.0
---
 pkgs/desktops/gnome/apps/ghex/default.nix | 32 ++++-------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix
index 1ec3c9dfdf27..bd68b393c3cc 100644
--- a/pkgs/desktops/gnome/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome/apps/ghex/default.nix
@@ -1,12 +1,10 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , pkg-config
 , gi-docgen
 , meson
 , ninja
-, python3
 , gnome
 , desktop-file-utils
 , appstream-glib
@@ -17,34 +15,20 @@
 , glib
 , atk
 , gobject-introspection
-, wrapGAppsHook
+, wrapGAppsHook4
 }:
 
 stdenv.mkDerivation rec {
   pname = "ghex";
-  version = "4.beta.1";
+  version = "42.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/ghex/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sBS/9cY++uHLGCbLeex8ZW697JJn3dK+HaM6tHBdwJ4=";
+    url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    sha256 = "Ly11VO8SimxoAJ2YY5TiBMMWeMU+HUpAnyGQmNS/ybs=";
   };
 
-  patches = [
-    # Fix build with -Werror=format-security
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/3d35359f3a12b6abb4a3d8a12a0f39b7221be408.patch";
-      sha256 = "4z9nUd+/eBOUGwl3MErse+FKLzGqtWKwkIzej57CnYk=";
-    })
-    # Build devhelp index.
-    # https://gitlab.gnome.org/GNOME/ghex/-/merge_requests/25
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/b26a7b1135ea2fe956a9bc0669b3b6ed818716c3.patch";
-      sha256 = "nYjjxds9GNWkW/RhXEe5zJzPF4TnLMsCELEqYR4dXTk=";
-    })
-  ];
-
   nativeBuildInputs = [
     desktop-file-utils
     gettext
@@ -53,9 +37,8 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     gi-docgen
-    python3
     gobject-introspection
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
@@ -73,11 +56,6 @@ stdenv.mkDerivation rec {
     "-Dgtk_doc=true"
   ];
 
-  postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
-  '';
-
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
     moveToOutput "share/doc" "$devdoc"