From 0fbb2f1517e83a0bb35c8e06d57170a3574c2f04 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Thu, 11 Jan 2018 18:11:10 +0800
Subject: qgo: unstable-2016-06-23 -> unstable-2017-12-18

---
 pkgs/games/qgo/default.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index 4848d1a3e215..924101c2d4a8 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -1,8 +1,15 @@
-{ stdenv, fetchFromGitHub, makeWrapper, qmake, qt56 }:
+{ stdenv
+, fetchFromGitHub
+, makeWrapper
+, qmake
+, qtbase
+, qtmultimedia
+, qttranslations
+}:
 
 stdenv.mkDerivation rec {
   name = "qgo-${version}";
-  version = "unstable-2016-06-23";
+  version = "unstable-2017-12-18";
 
   meta = with stdenv.lib; {
     description = "A Go client based on Qt5";
@@ -26,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pzorin";
     repo = "qgo";
-    rev = "1e65b0c74914e534ea4d040f8f0ef8908383e374";
+    rev = "bef526dda4c79686edd95c88cc68de24f716703c";
     sha256 = "1xzkayclmhsi07p9mnbf8185jw8n5ikxp2mik3x8qz1i6rmrfl5b";
   };
 
@@ -35,14 +42,7 @@ stdenv.mkDerivation rec {
     sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
   '';
   nativeBuildInputs = [ makeWrapper qmake ];
-  # qt58 does not provide platform plugins
-  # We need lib/qt*/plugins/platforms/libqxcb.so
-  buildInputs = with qt56; [ qtbase.out qtmultimedia qttranslations ];
+  buildInputs = [ qtbase qtmultimedia qttranslations ];
   enableParallelBuilding = true;
-  postFixup = ''
-    # libQt5XcbQpa is a platform plugin dependency and doesn't get linked
-    patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo
-    wrapProgram $out/bin/qgo \
-      --set QT_QPA_PLATFORM_PLUGIN_PATH "${stdenv.lib.getBin qt56.qtbase}/lib/qt-5.6/plugins/platforms/"
-  '';
+
 }
-- 
cgit 1.4.1