Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 132a9a0c32b8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db66867b9de9
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 9, 2019

  1. csound-qt 0.9.6-beta2 -> 0.9.6-beta3, plus python-qt include changes,… 

    … examplepath patch and simplified build
    @hlolli
    hlolli committed Mar 9, 2019
    Copy the full SHA
    b75042b View commit details

Commits on Mar 10, 2019

  1. csound-qt: fix indentation

    @veprbl
    veprbl authored Mar 10, 2019
    Copy the full SHA
    8bf0a82 View commit details

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

    csound-qt 0.9.6-beta2 -> 0.9.6-beta3, plus python-qt include changes
    @veprbl
    veprbl authored Mar 10, 2019
    Copy the full SHA
    db66867 View commit details
35 changes: 18 additions & 17 deletions pkgs/applications/audio/csound/csound-qt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,45 @@
{ 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/;
24 changes: 12 additions & 12 deletions pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@ index e5e0c896..9a9fa513 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -155,9 +155,9 @@ pythonqt {
"src/pyqcsobject.cpp"
}
rtmidi {
- HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h"
- SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp"
- INCLUDEPATH += src/../$${RTMIDI_DIR}
+ HEADERS += "$${RTMIDI_DIR}/RtMidi.h"
+ SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp"
+ INCLUDEPATH += $${RTMIDI_DIR}
}

perfThread_build {
"src/pyqcsobject.cpp"
}
rtmidi {
- HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h"
- SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp"
- INCLUDEPATH += src/../$${RTMIDI_DIR}
+ HEADERS += "$${RTMIDI_DIR}/RtMidi.h"
+ SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp"
+ INCLUDEPATH += $${RTMIDI_DIR}
}
perfThread_build {
4 changes: 2 additions & 2 deletions pkgs/development/libraries/python-qt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16529,10 +16529,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 {