diff --git a/build_system_fixes.patch b/build_system_fixes.patch index 6bce128..c9c0c22 100644 --- a/build_system_fixes.patch +++ b/build_system_fixes.patch @@ -48,25 +48,8 @@ ifeq ($(WARNINGS_AS_ERRORS), 1) WERROR = -Werror ---- source/bin/packages/visualization.patch.orig 2026-01-05 12:29:07.853820367 +0100 -+++ source/bin/packages/visualization.patch 2026-01-05 14:49:55.207100350 +0100 -@@ -120,3 +120,14 @@ - } - - void stop(){ -+--- Visualization-Library-master/CMakeLists.txt.orig 2026-01-05 14:47:57.797898038 +0100 -++++ Visualization-Library-master/CMakeLists.txt 2026-01-05 14:48:15.249865375 +0100 -+@@ -24,7 +24,7 @@ -+ project(Visualization_Library_SDK-${VLVERSION_MAJOR}.${VLVERSION_MINOR}) -+ -+ # Must be called after project! -+-cmake_minimum_required(VERSION 2.6) -++cmake_minimum_required(VERSION 3.5) -+ -+ ################################################################################ -+ # Global Build Settings --- source/bin/packages/build.sh.orig 2026-01-05 12:14:03.963801383 +0100 -+++ source/bin/packages/build.sh 2026-01-12 06:20:42.586497821 +0100 ++++ source/bin/packages/build.sh 2026-01-13 09:29:20.265932446 +0100 @@ -86,6 +86,7 @@ tar xvzf faust-2.81.2.tar.gz mv faust-2.81.2 faust @@ -75,7 +58,15 @@ rm -fr libraries tar xvzf ../faustlibraries_2024_01_05.tar.gz mv faustlibraries libraries -@@ -149,7 +150,7 @@ +@@ -130,6 +131,7 @@ + tar xvzf Visualization-Library-master.tar.gz + cd Visualization-Library-master/ + patch -p1 <../visualization.patch ++ patch -p1 <../vl_lib_cmake.patch + sed -i.backup 's/add_subdirectory("freetype")//' src/vlGraphics/plugins/CMakeLists.txt + #sed -i s/"VL_ACTOR_USER_DATA 0"/"VL_ACTOR_USER_DATA 1"/ src/vlCore/config.hpp + export MYFLAGS="-std=gnu++11 $CPPFLAGS -fPIC -g -Wno-c++11-narrowing -Wno-deprecated-declarations -Wno-implicit-function-declaration `pkg-config --cflags freetype2` " # -D_GLIBCXX_USE_CXX11_ABI=0 +@@ -149,7 +151,7 @@ build_libpds() { @@ -83,4 +74,4 @@ + NOWARNS="-Wno-return-mismatch -Wno-implicit-function-declaration -Wno-int-conversion -Wno-implicit-int -Wno-format-security" rm -fr libpd-master - tar xvzf libpd-master.tar.gz + tar xvzf libpd-master.tar.gz \ No newline at end of file diff --git a/package.nix b/package.nix index dbe7b07..49a34b8 100644 --- a/package.nix +++ b/package.nix @@ -153,10 +153,9 @@ in stdenv.mkDerivation rec { ./qt_paths.patch ./qwebengine_quirks.patch ./build_system_fixes.patch - # It might seem like a patch is missing --- - # `faust_llvm_21.patch'. But fear not; it is applied by the build - # system which is patched by `build_system_fixes.patch' to use the - # aforementioned. + # There are two other patches, which are applied with Radium's + # build system, not with Nix. Look at the last lines of + # ./build_system_fixes.patch to see that. ]; postPatch = '' @@ -166,12 +165,14 @@ in stdenv.mkDerivation rec { --replace-fail "/usr/bin/env" "${coreutils}/bin/env" # Next culprit: Python 2.7. Fucking janky build system. - # substituteInPlace bin/packages/build_python27.sh \ - # --replace-fail "CC=clang" "CC=${stdenv.cc}/bin/cc" \ - # --replace-fail "CXX=clang++" "CXX=${stdenv.cc}/bin/c++" + substituteInPlace bin/packages/build_python27.sh \ + --replace-fail "CC=clang" "CC=${stdenv.cc}/bin/cc" \ + --replace-fail "CXX=clang++" "CXX=${stdenv.cc}/bin/c++" # This is so Faust can build with LLVM > 18. cp ${./faust_llvm_21.patch} bin/packages/faust_llvm_21.patch + # So VisualizationLibrary can build with newer CMake. + cp ${./vl_lib_cmake.patch} bin/packages/vl_lib_cmake.patch # Fixes the desktop entry so it works nicely on GNOME. printf "StartupWMClass=radium_linux.bin" >> bin/radium.desktop diff --git a/vl_lib_cmake.patch b/vl_lib_cmake.patch new file mode 100644 index 0000000..62c5728 --- /dev/null +++ b/vl_lib_cmake.patch @@ -0,0 +1,11 @@ +--- Visualization-Library-master/CMakeLists.txt.orig 2026-01-05 14:47:57.797898038 +0100 ++++ Visualization-Library-master/CMakeLists.txt 2026-01-05 14:48:15.249865375 +0100 +@@ -24,7 +24,7 @@ + project(Visualization_Library_SDK-${VLVERSION_MAJOR}.${VLVERSION_MINOR}) + + # Must be called after project! +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + ################################################################################ + # Global Build Settings