supercollider: re-enable QtWebEngine and fix -FFTW3F-INCLUDE-DIR build error (#531489)
This commit is contained in:
@@ -16,6 +16,7 @@
|
|||||||
libxt,
|
libxt,
|
||||||
readline,
|
readline,
|
||||||
useSCEL ? false,
|
useSCEL ? false,
|
||||||
|
useQtWebEngine ? true,
|
||||||
emacs,
|
emacs,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
supercollider-with-plugins,
|
supercollider-with-plugins,
|
||||||
@@ -65,6 +66,7 @@ stdenv.mkDerivation rec {
|
|||||||
qt6.qtbase
|
qt6.qtbase
|
||||||
qt6.qtwebsockets
|
qt6.qtwebsockets
|
||||||
qt6.qtwayland
|
qt6.qtwayland
|
||||||
|
qt6.qtwebengine
|
||||||
readline
|
readline
|
||||||
]
|
]
|
||||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
|
++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
|
||||||
@@ -74,7 +76,7 @@ stdenv.mkDerivation rec {
|
|||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DSC_WII=OFF"
|
"-DSC_WII=OFF"
|
||||||
"-DSC_EL=${if useSCEL then "ON" else "OFF"}"
|
"-DSC_EL=${if useSCEL then "ON" else "OFF"}"
|
||||||
(lib.cmakeBool "SC_USE_QTWEBENGINE" false)
|
(lib.cmakeBool "SC_USE_QTWEBENGINE" useQtWebEngine)
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
cmake,
|
cmake,
|
||||||
supercollider,
|
supercollider,
|
||||||
fftw,
|
fftw,
|
||||||
|
fftwFloat,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@@ -25,6 +26,7 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
supercollider
|
supercollider
|
||||||
fftw
|
fftw
|
||||||
|
fftwFloat # builds without this will return an error message about no FFTW3F-INCLUDE-DIR
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
@@ -46,7 +48,9 @@ stdenv.mkDerivation rec {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "Community plugins for SuperCollider";
|
description = "Community plugins for SuperCollider";
|
||||||
homepage = "https://supercollider.github.io/sc3-plugins/";
|
homepage = "https://supercollider.github.io/sc3-plugins/";
|
||||||
maintainers = [ ];
|
maintainers = with lib.maintainers; [
|
||||||
|
pretentiousUsername
|
||||||
|
];
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user