dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #56050 from hlolli/csound-qt-update

Browse Source 
csound-qt 0.9.6-beta2 -> 0.9.6-beta3, plus python-qt include changes
This commit is contained in:
Dmitry Kalinkin 2019-03-10 12:42:01 -04:00 committed by GitHub
commit db66867b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,44 +1,45 @@
{ stdenv, csound, desktop-file-utils, { stdenv, csound, desktop-file-utils,
fetchFromGitHub, python, python-qt, qmake, fetchFromGitHub, python, python-qt, qmake,
qtwebengine, rtmidi, unzip }: qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "csound-qt-${version}"; name = "csound-qt-${version}";
version = "0.9.6-beta2"; version = "0.9.6-beta3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CsoundQt"; owner = "CsoundQt";
repo = "CsoundQt"; repo = "CsoundQt";
rev = "${version}"; rev = "${version}";
sha256 = "12jv7cvns3wj2npha0mvpn88kkkfsxsvhgzs2wrw04kbrvbhbffi"; sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip";
}; };
patches = [ ./rtmidipath.patch ]; patches = [
(fetchpatch {
name = "examplepath.patch";
url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff";
sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm";
})
./rtmidipath.patch
];
nativeBuildInputs = [ qmake qtwebengine ]; nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ];
buildInputs = [ csound desktop-file-utils rtmidi unzip ]; buildInputs = [ csound desktop-file-utils rtmidi ];
qmakeFlags = [ "qcs.pro" "CONFIG+=rtmidi" "CONFIG+=pythonqt" qmakeFlags = [ "qcs.pro" "CONFIG+=rtmidi" "CONFIG+=pythonqt"
"CONFIG+=record_support" "CONFIG+=html_webengine"
"CSOUND_INCLUDE_DIR=${csound}/include/csound" "CSOUND_INCLUDE_DIR=${csound}/include/csound"
"CSOUND_LIBRARY_DIR=${csound}/lib" "CSOUND_LIBRARY_DIR=${csound}/lib"
"RTMIDI_DIR=${rtmidi.src}" "RTMIDI_DIR=${rtmidi.src}"
"PYTHONQT_SRC_DIR=${python-qt}/lib" "PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt"
"PYTHONQT_LIB_DIR=${python-qt}/lib" "PYTHONQT_LIB_DIR=${python-qt}/lib"
"LIBS+=${python-qt}/lib/libPythonQt-Qt5-Python2.7.so" "LIBS+=-L${python-qt}/lib"
"LIBS+=${python-qt}/lib/libPythonQt_QtAll-Qt5-Python2.7.so"
"INCLUDEPATH+=${python-qt}/include/PythonQt" "INCLUDEPATH+=${python-qt}/include/PythonQt"
"INCLUDEPATH+=${python}/include/python2.7" "INCLUDEPATH+=${python}/include/python2.7"
"INSTALL_DIR=$(out)" "INSTALL_DIR=${placeholder "out"}"
"SHARE_DIR=$(out)/share" "SHARE_DIR=${placeholder "out"}/share"
]; ];
installPhase = ''
mkdir -p $out
cp -r bin $out
make install
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features."; description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features.";
homepage = https://csoundqt.github.io/; homepage = https://csoundqt.github.io/;

24
pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
View File

@ -3,15 +3,15 @@ index e5e0c896..9a9fa513 100644
--- a/src/src.pri --- a/src/src.pri
+++ b/src/src.pri +++ b/src/src.pri
@@ -155,9 +155,9 @@ pythonqt { @@ -155,9 +155,9 @@ pythonqt {
"src/pyqcsobject.cpp" "src/pyqcsobject.cpp"
} }
rtmidi { rtmidi {
- HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h" - HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h"
- SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp" - SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp"
- INCLUDEPATH += src/../$${RTMIDI_DIR} - INCLUDEPATH += src/../$${RTMIDI_DIR}
+ HEADERS += "$${RTMIDI_DIR}/RtMidi.h" + HEADERS += "$${RTMIDI_DIR}/RtMidi.h"
+ SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp" + SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp"
+ INCLUDEPATH += $${RTMIDI_DIR} + INCLUDEPATH += $${RTMIDI_DIR}
} }
perfThread_build { perfThread_build {

4
pkgs/development/libraries/python-qt/default.nix
View File

@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/include/PythonQt mkdir -p $out/include/PythonQt
cp -r ./lib $out cp -r ./lib $out
cp -r ./src/* $out/include/PythonQt cp -r ./src/* $out/include/PythonQt
cp extensions/PythonQt_QtAll/PythonQt_QtAll.h $out/include/PythonQt cp -r ./build $out/include/PythonQt
cp extensions/PythonQt_QtAll/PythonQt_QtAll.cpp $out/include/PythonQt cp -r ./extensions $out/include/PythonQt
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -16529,10 +16529,8 @@ in
pygments = python27Packages.pygments; pygments = python27Packages.pygments;
}; };
csound-qt = callPackage ../applications/audio/csound/csound-qt { csound-qt = libsForQt59.callPackage ../applications/audio/csound/csound-qt {
python = python27; python = python27;
qmake = qt59.qmake;
qtwebengine = qt59.qtwebengine;
}; };
cinepaint = callPackage ../applications/graphics/cinepaint { cinepaint = callPackage ../applications/graphics/cinepaint {