pyrox.dev
csound: clean after python-qt update
+4
-4
pkgs/applications/audio/csound/csound-qt/default.nix
+4
-4
pkgs/applications/audio/csound/csound-qt/default.nix
···
1
1
{ lib, stdenv, csound, desktop-file-utils,
2
-
fetchFromGitHub, python, python-qt, qmake,
2
+
fetchFromGitHub, python3, python-qt, qmake,
3
3
qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }:
4
4
5
5
stdenv.mkDerivation rec {
···
26
26
"CSOUND_INCLUDE_DIR=${csound}/include/csound"
27
27
"CSOUND_LIBRARY_DIR=${csound}/lib"
28
28
"RTMIDI_DIR=${rtmidi.src}"
29
-
"PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt"
29
+
"PYTHONQT_SRC_DIR=${python-qt.src}"
30
30
"PYTHONQT_LIB_DIR=${python-qt}/lib"
31
31
"LIBS+=-L${python-qt}/lib"
32
-
"INCLUDEPATH+=${python-qt}/include/PythonQt"
33
-
"INCLUDEPATH+=${python}/include/python${python.pythonVersion}"
34
32
"INSTALL_DIR=${placeholder "out"}"
35
33
"SHARE_DIR=${placeholder "out"}/share"
34
+
"PYTHON_DIR=${python3}"
35
+
"PYTHON_VERSION=3.${python3.sourceVersion.minor}"
36
36
];
37
37
38
38
meta = with lib; {
+1
-3
pkgs/top-level/all-packages.nix
+1
-3
pkgs/top-level/all-packages.nix
···
30348
30348
30349
30349
csound-manual = callPackage ../applications/audio/csound/csound-manual { };
30350
30350
30351
-
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
30352
-
python = python3;
30353
-
};
30351
+
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
30354
30352
30355
30353
codeblocks = callPackage ../applications/editors/codeblocks { };
30356
30354
codeblocksFull = codeblocks.override { contribPlugins = true; };