diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-04-22 10:24:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-22 10:24:38 +0200 |
commit | c9d72a6fd49f7b20615019f05aededbb7a5f382c (patch) | |
tree | 033a2aa7221a37c9b6b4ce811df3b9b1f45c174e /pkgs/applications/audio | |
parent | 1a8423b70d06dc54d1626cbea10b1801da5bcbf7 (diff) | |
parent | bcaf5dd0fba1a902aa1377971560d6fd82a427dd (diff) |
Merge pull request #302361 from nim65s/pythonqt
python-qt: 3.4.2 -> 3.5.1
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/csound/csound-qt/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index e48b45aec3e42..c2c9432eaeb0b 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, csound, desktop-file-utils, - fetchFromGitHub, python, python-qt, qmake, + fetchFromGitHub, python3, python-qt, qmake, qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { "CSOUND_INCLUDE_DIR=${csound}/include/csound" "CSOUND_LIBRARY_DIR=${csound}/lib" "RTMIDI_DIR=${rtmidi.src}" - "PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt" + "PYTHONQT_SRC_DIR=${python-qt.src}" "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" - "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" + "PYTHON_DIR=${python3}" + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; meta = with lib; { |