From 85064e31576a53b5bfef3d23f1d3aa79347f1fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Sun, 30 Jun 2024 08:10:01 -0400 Subject: [PATCH] [nix] more vendoring --- 3rdparty/libossia | 2 +- 3rdparty/sndfile.cmake | 12 ++++++++++++ ci/nix.build.nix | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/3rdparty/libossia b/3rdparty/libossia index ca04564630..46e3b15653 160000 --- a/3rdparty/libossia +++ b/3rdparty/libossia @@ -1 +1 @@ -Subproject commit ca04564630ccefa4e978eaaa811e8a195ab46866 +Subproject commit 46e3b15653d770027e265e4dd89c3f247ec0ca48 diff --git a/3rdparty/sndfile.cmake b/3rdparty/sndfile.cmake index 76fa2c1cee..1d02895c27 100644 --- a/3rdparty/sndfile.cmake +++ b/3rdparty/sndfile.cmake @@ -4,6 +4,18 @@ endif() if(SCORE_USE_SYSTEM_LIBRARIES) find_package(SndFile GLOBAL CONFIG) + if(NOT TARGET SndFile::sndfile) + if(NOT TARGET sndfile) + find_library(SNDFILE_LIBRARY NAMES SndFile sndfile) + find_path(SNDFILE_INCLUDE_DIR sndfile.h) + if(SNDFILE_LIBRARY AND SNDFILE_INCLUDE_DIR) + add_library(sndfile IMPORTED INTERFACE GLOBAL) + add_library(SndFile::sndfile ALIAS sndfile) + target_include_directories(sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}") + target_link_libraries(sndfile INTERFACE "${SNDFILE_LIBRARY}") + endif() + endif() + endif() else() disable_var(BUILD_PROGRAMS) disable_var(BUILD_EXAMPLES) diff --git a/ci/nix.build.nix b/ci/nix.build.nix index 7e9fdad16a..5b62f6567b 100644 --- a/ci/nix.build.nix +++ b/ci/nix.build.nix @@ -6,6 +6,7 @@ , pkg-config , alsa-lib , avahi +, avahi-compat , bluez , boost185 # , faust @@ -31,6 +32,8 @@ , qt6 , rapidfuzz-cpp , re2 +, rubberband +, snappy , SDL2 , spdlog , suil @@ -51,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { boost185 # faust avahi + avahi-compat bluez ffmpeg fftw @@ -81,6 +85,8 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtwebsockets rapidfuzz-cpp re2 + rubberband + snappy SDL2 spdlog suil @@ -96,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_UNITY_BUILD=1" "-DCMAKE_SKIP_RPATH=ON" "-DOSSIA_USE_SYSTEM_LIBRARIES=1" + "-DSCORE_USE_SYSTEM_LIBRARIES=1" "-DLilv_INCLUDE_DIR=${lilv.dev}/include/lilv-0" "-DLilv_LIBRARY=${lilv}/lib/liblilv-0.so" @@ -118,6 +125,18 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + runtimeDependencies = [ + alsa-lib + avahi + avahi-compat + bluez + fftw + libjack2 + lilv + pipewire + udev + ]; + meta = with lib; { homepage = "https://ossia.io/score/about.html"; description = "A sequencer for audio-visual artists, designed to enable the creation of interactive shows, museum installations, intermedia digital artworks, interactive music and more";