diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index 953a919d0c70..e48b45aec3e4 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,28 +1,23 @@ { lib, stdenv, csound, desktop-file-utils, fetchFromGitHub, python, python-qt, qmake, - qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: + qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "csound-qt"; - version = "0.9.6-beta3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; - rev = version; - sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; + rev = "v${version}"; + hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28="; }; patches = [ - (fetchpatch { - name = "examplepath.patch"; - url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff"; - sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm"; - }) ./rtmidipath.patch ]; - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ]; + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns wrapQtAppsHook ]; buildInputs = [ csound desktop-file-utils rtmidi ]; @@ -35,13 +30,11 @@ stdenv.mkDerivation rec { "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python2.7" + "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" ]; - dontWrapQtApps = true; - meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch index 4cbab8a128fc..4e22295d43ff 100644 --- a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch +++ b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch @@ -1,8 +1,8 @@ -diff --git a/src/src.pri b/src/src.pri -index e5e0c896..9a9fa513 100644 ---- a/src/src.pri -+++ b/src/src.pri -@@ -155,9 +155,9 @@ pythonqt { +diff --git a/src/src.pri b/src/src.pri +index e5e0c896..9a9fa513 100644 +--- a/src/src.pri ++++ b/src/src.pri +@@ -155,9 +155,9 @@ pythonqt { "src/pyqcsobject.cpp" } rtmidi { diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2be89b3b7534..f4574a1704ef 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a59edddf426..957705e129e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22350,7 +22350,7 @@ with pkgs; pylode = callPackage ../misc/pylode {}; python-qt = callPackage ../development/libraries/python-qt { - python = python27; + python = python3; inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; }; @@ -28204,7 +28204,7 @@ with pkgs; csound-manual = callPackage ../applications/audio/csound/csound-manual { }; csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { - python = python27; + python = python3; }; codeblocks = callPackage ../applications/editors/codeblocks { };