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

csound-qt 0.9.6-beta2 -> 0.9.6-beta3, plus python-qt include changes, examplepath patch and simplified build

Browse Source
This commit is contained in:
hlolli 2019-03-09 19:38:26 +01:00
parent 40953c84e4
commit b75042bfbb
4 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,44 +1,43 @@
{ stdenv, csound, desktop-file-utils,
fetchFromGitHub, python, python-qt, qmake,
qtwebengine, rtmidi, unzip }:
qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
stdenv.mkDerivation rec {
name = "csound-qt-${version}";
version = "0.9.6-beta2";
version = "0.9.6-beta3";
src = fetchFromGitHub {
owner = "CsoundQt";
repo = "CsoundQt";
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"
"CONFIG+=record_support" "CONFIG+=html_webengine"
"CSOUND_INCLUDE_DIR=${csound}/include/csound"
"CSOUND_LIBRARY_DIR=${csound}/lib"
"RTMIDI_DIR=${rtmidi.src}"
"PYTHONQT_SRC_DIR=${python-qt}/lib"
"PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt"
"PYTHONQT_LIB_DIR=${python-qt}/lib"
"LIBS+=${python-qt}/lib/libPythonQt-Qt5-Python2.7.so"
"LIBS+=${python-qt}/lib/libPythonQt_QtAll-Qt5-Python2.7.so"
"LIBS+=-L${python-qt}/lib"
"INCLUDEPATH+=${python-qt}/include/PythonQt"
"INCLUDEPATH+=${python}/include/python2.7"
"INSTALL_DIR=$(out)"
"SHARE_DIR=$(out)/share"
"INSTALL_DIR=${placeholder "out"}"
"SHARE_DIR=${placeholder "out"}/share"
];
installPhase = ''
mkdir -p $out
cp -r bin $out
make install
'';
meta = with stdenv.lib; {
description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features.";
homepage = https://csoundqt.github.io/;

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

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

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

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