python-qt: 3.2 -> 3.3.0
This commit is contained in:
@@ -1,26 +1,43 @@
|
||||
{ lib, stdenv, fetchurl, python, qmake,
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake,
|
||||
qtwebengine, qtxmlpatterns,
|
||||
qttools, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2";
|
||||
pname = "python-qt";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url="mirror://sourceforge/pythonqt/PythonQt${version}.zip";
|
||||
sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MeVisLab";
|
||||
repo = "pythonqt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-unneeded-pydebug-include.patch";
|
||||
url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch";
|
||||
includes = [ "src/PythonQt.cpp" ];
|
||||
hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0=";
|
||||
})
|
||||
];
|
||||
|
||||
# https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt
|
||||
postPatch = ''
|
||||
substituteInPlace build/python.prf \
|
||||
--replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}"
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
qmakeFlags = [ "PythonQt.pro"
|
||||
"INCLUDEPATH+=${python}/include/python3.6"
|
||||
"PYTHON_PATH=${python}/bin"
|
||||
"PYTHON_LIB=${python}/lib"];
|
||||
qmakeFlags = [
|
||||
"PythonQt.pro"
|
||||
"PYTHON_DIR=${python}"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
||||
@@ -22346,7 +22346,7 @@ with pkgs;
|
||||
pylode = callPackage ../misc/pylode {};
|
||||
|
||||
python-qt = callPackage ../development/libraries/python-qt {
|
||||
python = python27;
|
||||
python = python3;
|
||||
inherit (qt5) qmake qttools qtwebengine qtxmlpatterns;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user