diff options
| author | Will Dietz <w@wdtz.org> | 2018-09-19 14:18:34 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-09-19 14:18:34 -0500 |
| commit | 6108d6ada849d29b9129148943dd1c1feedd4d02 (patch) | |
| tree | 34ba76062fcae946d7a7453a44c907ae2fbcd37a /pkgs/os-specific/linux/i7z | |
| parent | 9219580c823e8aa724b7426cddd7222d78856bf9 (diff) | |
| download | nixlib-6108d6ada849d29b9129148943dd1c1feedd4d02.tar nixlib-6108d6ada849d29b9129148943dd1c1feedd4d02.tar.gz nixlib-6108d6ada849d29b9129148943dd1c1feedd4d02.tar.bz2 nixlib-6108d6ada849d29b9129148943dd1c1feedd4d02.tar.lz nixlib-6108d6ada849d29b9129148943dd1c1feedd4d02.tar.xz nixlib-6108d6ada849d29b9129148943dd1c1feedd4d02.tar.zst nixlib-6108d6ada849d29b9129148943dd1c1feedd4d02.zip | |
i7z: use qt5 for gui (when enabled), various fixes from debian
Diffstat (limited to 'pkgs/os-specific/linux/i7z')
| -rw-r--r-- | pkgs/os-specific/linux/i7z/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/i7z/qt5.patch | 13 |
2 files changed, 32 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index c6e06bf85272..ac5f9fc5ba30 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 000000000000..9e9b162d9e85 --- /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 |