tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
csound: clean after python-qt update
Guilhem Saurel
2 years ago
c01125ff
04a1d9b2
+5
-7
2 changed files
expand all
collapse all
unified
split
pkgs
applications
audio
csound
csound-qt
default.nix
top-level
all-packages.nix
+4
-4
pkgs/applications/audio/csound/csound-qt/default.nix
···
1
{ lib, stdenv, csound, desktop-file-utils,
2
-
fetchFromGitHub, python, python-qt, qmake,
3
qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }:
4
5
stdenv.mkDerivation rec {
···
26
"CSOUND_INCLUDE_DIR=${csound}/include/csound"
27
"CSOUND_LIBRARY_DIR=${csound}/lib"
28
"RTMIDI_DIR=${rtmidi.src}"
29
-
"PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt"
30
"PYTHONQT_LIB_DIR=${python-qt}/lib"
31
"LIBS+=-L${python-qt}/lib"
32
-
"INCLUDEPATH+=${python-qt}/include/PythonQt"
33
-
"INCLUDEPATH+=${python}/include/python${python.pythonVersion}"
34
"INSTALL_DIR=${placeholder "out"}"
35
"SHARE_DIR=${placeholder "out"}/share"
0
0
36
];
37
38
meta = with lib; {
···
1
{ lib, stdenv, csound, desktop-file-utils,
2
+
fetchFromGitHub, python3, python-qt, qmake,
3
qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }:
4
5
stdenv.mkDerivation rec {
···
26
"CSOUND_INCLUDE_DIR=${csound}/include/csound"
27
"CSOUND_LIBRARY_DIR=${csound}/lib"
28
"RTMIDI_DIR=${rtmidi.src}"
29
+
"PYTHONQT_SRC_DIR=${python-qt.src}"
30
"PYTHONQT_LIB_DIR=${python-qt}/lib"
31
"LIBS+=-L${python-qt}/lib"
0
0
32
"INSTALL_DIR=${placeholder "out"}"
33
"SHARE_DIR=${placeholder "out"}/share"
34
+
"PYTHON_DIR=${python3}"
35
+
"PYTHON_VERSION=3.${python3.sourceVersion.minor}"
36
];
37
38
meta = with lib; {
+1
-3
pkgs/top-level/all-packages.nix
···
30348
30349
csound-manual = callPackage ../applications/audio/csound/csound-manual { };
30350
30351
-
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
30352
-
python = python3;
30353
-
};
30354
30355
codeblocks = callPackage ../applications/editors/codeblocks { };
30356
codeblocksFull = codeblocks.override { contribPlugins = true; };
···
30348
30349
csound-manual = callPackage ../applications/audio/csound/csound-manual { };
30350
30351
+
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
0
0
30352
30353
codeblocks = callPackage ../applications/editors/codeblocks { };
30354
codeblocksFull = codeblocks.override { contribPlugins = true; };