colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

csound: clean after python-qt update

This commit is contained in:
Guilhem Saurel 2024-04-07 16:48:23 +02:00
parent 04a1d9b204
commit c01125ff83
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/audio/csound/csound-qt/default.nix
View File

@ -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; {

4
pkgs/top-level/all-packages.nix
View File

@ -30348,9 +30348,7 @@ with pkgs;
csound-manual = callPackage ../applications/audio/csound/csound-manual { };
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
python = python3;
};
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
codeblocks = callPackage ../applications/editors/codeblocks { };
codeblocksFull = codeblocks.override { contribPlugins = true; };