From 92904173001cf23d03e8f9ccd3d338bd2ada963a Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 18:19:38 +0100
Subject: [PATCH] pentobi: 18.1 -> 18.3

 * Rewrite without stdenv and wrapQtAppsHook
 * Fetch source from GithHub
---
 pkgs/games/pentobi/default.nix  | 24 ++++++++++++------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
index f0f6ccb8a129..b8a4935aa267 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/pkgs/games/pentobi/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, appstream, fetchurl, cmake, gettext, libxslt, librsvg, itstool
-  , qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl
-  , wrapQtAppsHook
+{ lib, mkDerivation, appstream, fetchFromGitHub, cmake, gettext, libxslt, librsvg, itstool
+, qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl
 }:
 
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  version = "18.1";
+mkDerivation rec {
+  version = "18.3";
   pname = "pentobi";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz";
-    sha256 = "1vfw61lk9z7dngncmx3fggy5ld7ksdk48dpwnsq2vl5fh3f71qbq";
+  src = fetchFromGitHub {
+    owner = "enz";
+    repo = "pentobi";
+    rev = "v${version}";
+    sha256 = "9AymvAlXi0zkkcakTR0mC4gmyrweZR4EwlhORkmVshw=";
   };
 
-  nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ];
-  buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qttools qtwebview itstool librsvg ];
+  nativeBuildInputs = [ cmake docbook_xsl qttools ];
+  buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qtwebview itstool librsvg ];
 
   patchPhase = ''
     substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its"
   ];
 
-  meta = {
+  meta = with lib; {
     description = "A computer opponent for the board game Blokus";
     homepage = "https://pentobi.sourceforge.io";
     license = licenses.gpl3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c96923f50ba..4fd0fb97c1c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25601,7 +25601,7 @@ in
 
   papermc = callPackage ../games/papermc { };
 
-  pentobi = libsForQt514.callPackage ../games/pentobi { };
+  pentobi = libsForQt5.callPackage ../games/pentobi { };
 
   performous = callPackage ../games/performous {
     boost = boost166;