i7z: use qt5 for gui (when enabled), various fixes from debian
This commit is contained in:
parent
9219580c82
commit
6108d6ada8
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, lib, fetchFromGitHub, ncurses
|
{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses
|
||||||
, withGui ? false, qt4 ? null }:
|
, withGui ? false, qtbase }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "i7z-${version}";
|
name = "i7z-${version}";
|
||||||
@ -12,7 +12,23 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds";
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
13
pkgs/os-specific/linux/i7z/qt5.patch
Normal file
13
pkgs/os-specific/linux/i7z/qt5.patch
Normal file
@ -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
|
@ -13900,7 +13900,7 @@ with pkgs;
|
|||||||
|
|
||||||
hwdata = callPackage ../os-specific/linux/hwdata { };
|
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 { };
|
pcm = callPackage ../os-specific/linux/pcm { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user