diff options
author | hlolli <hlolli@gmail.com> | 2019-03-09 19:38:26 +0100 |
---|---|---|
committer | hlolli <hlolli@gmail.com> | 2019-03-09 19:38:26 +0100 |
commit | b75042bfbb89107afecff71db6ace3bae98cd011 (patch) | |
tree | a2185a681361b7c826cb8d55fffd7e0dec24ec99 /pkgs/applications/audio/csound/csound-qt/default.nix | |
parent | 40953c84e486625548dd81f45413178a0a9bfc48 (diff) | |
download | nixpkgs-b75042bfbb89107afecff71db6ace3bae98cd011.tar nixpkgs-b75042bfbb89107afecff71db6ace3bae98cd011.tar.gz nixpkgs-b75042bfbb89107afecff71db6ace3bae98cd011.tar.bz2 nixpkgs-b75042bfbb89107afecff71db6ace3bae98cd011.tar.lz nixpkgs-b75042bfbb89107afecff71db6ace3bae98cd011.tar.xz nixpkgs-b75042bfbb89107afecff71db6ace3bae98cd011.tar.zst nixpkgs-b75042bfbb89107afecff71db6ace3bae98cd011.zip |
csound-qt 0.9.6-beta2 -> 0.9.6-beta3, plus python-qt include changes, examplepath patch and simplified build
Diffstat (limited to 'pkgs/applications/audio/csound/csound-qt/default.nix')
-rw-r--r-- | pkgs/applications/audio/csound/csound-qt/default.nix | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index e9415335388..6a943ce1e2c 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -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/; |