csound-qt: 0.9.6-beta3 -> 1.1.1
This commit is contained in:
parent
016283c5bd
commit
dd3cc02d7d
|
@ -1,28 +1,23 @@
|
||||||
{ lib, stdenv, csound, desktop-file-utils,
|
{ lib, stdenv, csound, desktop-file-utils,
|
||||||
fetchFromGitHub, python, python-qt, qmake,
|
fetchFromGitHub, python, python-qt, qmake,
|
||||||
qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
|
qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "csound-qt";
|
pname = "csound-qt";
|
||||||
version = "0.9.6-beta3";
|
version = "1.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "CsoundQt";
|
owner = "CsoundQt";
|
||||||
repo = "CsoundQt";
|
repo = "CsoundQt";
|
||||||
rev = version;
|
rev = "v${version}";
|
||||||
sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip";
|
hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
(fetchpatch {
|
|
||||||
name = "examplepath.patch";
|
|
||||||
url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff";
|
|
||||||
sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm";
|
|
||||||
})
|
|
||||||
./rtmidipath.patch
|
./rtmidipath.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ];
|
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns wrapQtAppsHook ];
|
||||||
|
|
||||||
buildInputs = [ csound desktop-file-utils rtmidi ];
|
buildInputs = [ csound desktop-file-utils rtmidi ];
|
||||||
|
|
||||||
|
@ -35,13 +30,11 @@ stdenv.mkDerivation rec {
|
||||||
"PYTHONQT_LIB_DIR=${python-qt}/lib"
|
"PYTHONQT_LIB_DIR=${python-qt}/lib"
|
||||||
"LIBS+=-L${python-qt}/lib"
|
"LIBS+=-L${python-qt}/lib"
|
||||||
"INCLUDEPATH+=${python-qt}/include/PythonQt"
|
"INCLUDEPATH+=${python-qt}/include/PythonQt"
|
||||||
"INCLUDEPATH+=${python}/include/python2.7"
|
"INCLUDEPATH+=${python}/include/python${python.pythonVersion}"
|
||||||
"INSTALL_DIR=${placeholder "out"}"
|
"INSTALL_DIR=${placeholder "out"}"
|
||||||
"SHARE_DIR=${placeholder "out"}/share"
|
"SHARE_DIR=${placeholder "out"}/share"
|
||||||
];
|
];
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with 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/";
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/src/src.pri b/src/src.pri
|
diff --git a/src/src.pri b/src/src.pri
|
||||||
index e5e0c896..9a9fa513 100644
|
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 {
|
||||||
|
|
|
@ -28211,7 +28211,7 @@ with pkgs;
|
||||||
csound-manual = callPackage ../applications/audio/csound/csound-manual { };
|
csound-manual = callPackage ../applications/audio/csound/csound-manual { };
|
||||||
|
|
||||||
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
|
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
|
||||||
python = python27;
|
python = python3;
|
||||||
};
|
};
|
||||||
|
|
||||||
codeblocks = callPackage ../applications/editors/codeblocks { };
|
codeblocks = callPackage ../applications/editors/codeblocks { };
|
||||||
|
|
Loading…
Reference in a new issue