[ci] nix work

ossia · Jun 9, 2024 · d9ad8b9 · d9ad8b9
1 parent fd8efed
commit d9ad8b9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Releases are available for [Windows, Linux (via AppImage) and Mac OS X](https://
 | Debian (Bookworm, Trixie)         | [![Debian](https://github.com/ossia/score/actions/workflows/debian-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/debian-builds.yaml)                  |
 | Ubuntu (22.04, 23.04, 24.04)      | [![Ubuntu](https://github.com/ossia/score/actions/workflows/ubuntu-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/ubuntu-builds.yaml)                  |
 | Raspberry Pi (Bullseye AArch64)   | [![RPi](https://github.com/ossia/score/actions/workflows/embedded.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/embedded.yaml)                               |
-| Nix                               | [![Nix](https://github.com/ossia/score/actions/workflows/nix.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/nix.yaml)                                         |
+| Nix                               | [![Nix](https://github.com/ossia/score/actions/workflows/nix-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/nix-builds.yaml)                                         |
 | WebAssembly                       | [![WASM](https://github.com/ossia/score/actions/workflows/wasm.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/wasm.yaml)                                      |
 | Plug-in templates                 | [![Template check](https://github.com/ossia/score/actions/workflows/templates.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/templates.yaml)                  |
 

diff --git a/ci/nix.build.nix b/ci/nix.build.nix
@@ -4,11 +4,12 @@
 , cmake
 , ninja
 , pkg-config
-, qttools
-, wrapQtAppsHook
 , alsa-lib
+, avahi
+, bluez
 , boost185
 # , faust
+, fmt
 , git
 , ffmpeg
 , fftw
@@ -27,17 +28,13 @@
 , portaudio
 , portmidi
 , libsamplerate
-, qtbase
-, qtdeclarative
-, qtscxml
-, qtserialport
-, qtshadertools
-, qtsvg
-, qtwayland
-, qtwebsockets
+, qt6
 , rapidfuzz-cpp
 , re2
+, sdl2
+, spdlog
 , suil
+, udev
 }:
 
 # TODO: figure out LLVM jit
@@ -47,17 +44,18 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "ossia-score";
   version = "devel";
   src = ../.;
-  nativeBuildInputs = [ cmake ninja pkg-config qttools wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake ninja pkg-config qt6.qttools qt6.wrapQtAppsHook ];
 
-  # TODO: figure out if we want avahi / bluez / speex / SDL2 (needed for joystick support) by default
-  # what about leapmotion?
   buildInputs = [
     alsa-lib
     boost185
     # faust
+    avahi
+    bluez
     ffmpeg
     fftw
     flac
+    fmt
     git
     gnutls
     lame
@@ -73,17 +71,20 @@ stdenv.mkDerivation (finalAttrs: {
     pipewire
     portaudio
     portmidi
-    qtbase
-    qtdeclarative
-    qtserialport
-    qtscxml
-    qtshadertools
-    qtsvg
-    qtwayland
-    qtwebsockets
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtserialport
+    qt6.qtscxml
+    qt6.qtshadertools
+    qt6.qtsvg
+    qt6.qtwayland
+    qt6.qtwebsockets
     rapidfuzz-cpp
     re2
+    sdl2
+    spdlog
     suil
+    udev
   ];
 
   cmakeFlags = [
@@ -96,9 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_SKIP_RPATH=ON"
     "-DOSSIA_USE_SYSTEM_LIBRARIES=1"
 
-    "-DCMAKE_CXX_FLAGS=-O0"
-    "-DCMAKE_EXE_LINKER_FLAGS=-O0"
-
     "-DLilv_INCLUDE_DIR=${lilv.dev}/include/lilv-0"
     "-DLilv_LIBRARY=${lilv}/lib/liblilv-0.so"