From 6bb07ecbbc969d9afd9dccdd23c8ff4eaeba560c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 13:16:17 -0500
Subject: [PATCH 1/3] i7z: move to maintained fork (FreeBSD folks), 0.27.2 ->
 0.27.3

---
 pkgs/os-specific/linux/i7z/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index 48d28036aa4..3bf9fbd74d3 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, lib, fetchurl, ncurses
+{ stdenv, lib, fetchFromGitHub, ncurses
 , withGui ? false, qt4 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "i7z-0.27.2";
+  name = "i7z-${version}";
+  version = "0.27.3";
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/i7z/${name}.tar.gz";
-    sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7";
+  src = fetchFromGitHub {
+    owner = "DimitryAndric";
+    repo = "i7z";
+    rev = "v${version}";
+    sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds";
   };
 
   buildInputs = [ ncurses ] ++ lib.optional withGui qt4;

From 9219580c823e8aa724b7426cddd7222d78856bf9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 14:04:48 -0500
Subject: [PATCH 2/3] i7z: simplify a bit

---
 pkgs/os-specific/linux/i7z/default.nix | 27 ++++++--------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index 3bf9fbd74d3..c6e06bf8527 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -16,39 +16,24 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildPhase = ''
-    runHook preBuild
-
-    make
-    ${lib.optionalString withGui ''
+  postBuild = lib.optionalString withGui ''
       cd GUI
       qmake
       make clean
       make
       cd ..
-    ''}
-
-    runHook postBuild
   '';
 
-  installPhase = ''
-    runHook preInstall
+  makeFlags = [ "prefix=${placeholder "out"}" ];
 
-    mkdir -p $out/{bin,sbin}
-    make install prefix=$out
-    ${lib.optionalString withGui ''
-      install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui
-    ''}
-    mv $out/sbin/* $out/bin/
-    rmdir $out/sbin
-
-    runHook postInstall
+  postInstall = lib.optionalString withGui ''
+    install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui
   '';
 
   meta = with lib; {
     description = "A better i7 (and now i3, i5) reporting tool for Linux";
-    homepage = https://github.com/ajaiantilal/i7z;
-    repositories.git = https://github.com/ajaiantilal/i7z.git;
+    homepage = https://github.com/DimitryAndric/i7z;
+    repositories.git = https://github.com/DimitryAndric/i7z.git;
     license = licenses.gpl2;
     maintainers = with maintainers; [ bluescreen303 ];
     # broken on ARM

From 6108d6ada849d29b9129148943dd1c1feedd4d02 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 14:18:34 -0500
Subject: [PATCH 3/3] i7z: use qt5 for gui (when enabled), various fixes from
 debian

---
 pkgs/os-specific/linux/i7z/default.nix | 22 +++++++++++++++++++---
 pkgs/os-specific/linux/i7z/qt5.patch   | 13 +++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/i7z/qt5.patch

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index c6e06bf8527..ac5f9fc5ba3 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, ncurses
-, withGui ? false, qt4 ? null }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses
+, withGui ? false, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "i7z-${version}";
@@ -12,7 +12,23 @@ stdenv.mkDerivation rec {
     sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds";
   };
 
-  buildInputs = [ ncurses ] ++ lib.optional withGui qt4;
+  buildInputs = [ ncurses ] ++ lib.optional withGui qtbase;
+
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/fix-insecure-tempfile.patch";
+      sha256 = "0ifg06xjw14y4fnzzgkhqm4sv9mcdzgi8m2wffq9z8b1r0znya3s";
+    })
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/nehalem.patch";
+      sha256 = "1ys6sgm01jkqb6d4y7qc3h89dzph8jjjcfya5c5jcm7dkxlzjq8a";
+    })
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/hyphen-used-as-minus-sign.patch";
+      sha256 = "1ji2qvdyq0594cpqz0dlsfggvw3rm63sygh0jxvwjgxpnhykhg1p";
+    })
+    ./qt5.patch
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/i7z/qt5.patch b/pkgs/os-specific/linux/i7z/qt5.patch
new file mode 100644
index 00000000000..9e9b162d9e8
--- /dev/null
+++ b/pkgs/os-specific/linux/i7z/qt5.patch
@@ -0,0 +1,13 @@
+diff -Naur a/GUI/i7z_GUI.pro b/GUI/i7z_GUI.pro
+--- a/GUI/i7z_GUI.pro	2013-10-12 21:59:19.000000000 +0100
++++ b/GUI/i7z_GUI.pro	2016-11-05 13:54:30.118655672 +0000
+@@ -3,7 +3,8 @@
+ ######################################################################
+ 
+ TEMPLATE = app
+-TARGET = 
++TARGET = i7z_GUI
++QT += widgets
+ DEPENDPATH += .
+ INCLUDEPATH += .
+ CONFIG += debug
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3308817473..57633b0ae6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13900,7 +13900,7 @@ with pkgs;
 
   hwdata = callPackage ../os-specific/linux/hwdata { };
 
-  i7z = callPackage ../os-specific/linux/i7z { };
+  i7z = qt5.callPackage ../os-specific/linux/i7z { };
 
   pcm = callPackage ../os-specific/linux/pcm { };