From a3deb65c596a71bee76984c8244596753cceecb1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 6 Jun 2023 10:54:38 +0300
Subject: [PATCH] pokerth, pokerth-server: unpin boost16x

---
 pkgs/games/pokerth/default.nix  | 33 ++++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |  5 +----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index fba528933ff..021fe4100ea 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -1,19 +1,8 @@
-{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, qtbase
 , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
 , wrapQtAppsHook
 , tinyxml2, target ? "client" }:
 
-let
-  hiDPI = fetchpatch {
-    url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch";
-    sha256 = "192x3lqvd1fanasb95shdygn997qfrpk1k62k1f4j3s5chkwvjig";
-  };
-
-  revertPatch = patch: runCommand "revert-${patch.name}" {} ''
-    ${patchutils}/bin/interdiff ${patch} /dev/null > $out
-  '';
-in
-
 mkDerivation rec {
   pname = "pokerth-${target}";
   version = "1.1.2";
@@ -21,12 +10,26 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pokerth";
     repo = "pokerth";
-    rev = "f5688e01b0efb37035e3b0e3a432200185b9a0c5";
-    sha256 = "0la8d036pbscjnbxf8lkrqjfq8a4ywsfwxil452fhlays6mr19h0";
+    rev = "v${version}";
+    hash = "sha256-j4E3VMpaPqX7+hE3wYRZZUeRD//F+K2Gp8oPmJqX5FQ=";
   };
 
   patches = [
-    (revertPatch hiDPI)
+    (fetchpatch {
+      name = "pokerth-1.1.2.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
+      hash = "sha256-we2UOCFF5J/Wlji/rJeCHDu/dNsUU+R+bTw83AmvDxs=";
+    })
+    (fetchpatch {
+      name = "pokerth-1.1.2.patch.2019";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2019?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
+      hash = "sha256-m6uFPmPC3T9kV7EI1p33vQSi0d/w+YCH0dKjviAphMY=";
+    })
+    (fetchpatch {
+      name = "pokerth-1.1.2.patch.2020";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2020?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
+      hash = "sha256-I2qrgLGSMvFDHyUZFWGPGnuecZ914NBf2uGK02X/wOg=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3993ab84b76..93ec97be48e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37006,12 +37006,9 @@ with pkgs;
 
   pong3d = callPackage ../games/pong3d { };
 
-  pokerth = libsForQt5.callPackage ../games/pokerth {
-    boost = boost16x;
-  };
+  pokerth = libsForQt5.callPackage ../games/pokerth { };
 
   pokerth-server = libsForQt5.callPackage ../games/pokerth {
-    boost = boost16x;
     target = "server";
   };