diff --git a/pkgs/by-name/co/coloquinte/package.nix b/pkgs/by-name/co/coloquinte/package.nix index a4fa5e081480..d1bd2d02b9f3 100644 --- a/pkgs/by-name/co/coloquinte/package.nix +++ b/pkgs/by-name/co/coloquinte/package.nix @@ -19,6 +19,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BQg2rVYe1wJOX7YnvgDVpmN6hwBJZKH0fxm+8HC8bvY="; }; + # boost 1.89 removed the boost_system stub library + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'FIND_PACKAGE(Boost REQUIRED COMPONENTS system filesystem iostreams program_options unit_test_framework)' \ + 'FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem iostreams program_options unit_test_framework)' + ''; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cp/cpp-hocon/package.nix b/pkgs/by-name/cp/cpp-hocon/package.nix index 1cc2417bf594..84af9dee0eab 100644 --- a/pkgs/by-name/cp/cpp-hocon/package.nix +++ b/pkgs/by-name/cp/cpp-hocon/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt --replace-fail \ "cmake_minimum_required(VERSION 3.2.2)" \ "cmake_minimum_required(VERSION 3.10)" + + # boost 1.89 removed the boost_system stub library + substituteInPlace CMakeLists.txt --replace-fail \ + 'list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem system program_options)' \ + 'list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem program_options)' ''; env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/by-name/fi/fileshelter/package.nix b/pkgs/by-name/fi/fileshelter/package.nix index f14f43ec3f30..b56c99aaa2dd 100644 --- a/pkgs/by-name/fi/fileshelter/package.nix +++ b/pkgs/by-name/fi/fileshelter/package.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i '1i #include ' src/fileshelter/ui/ShareCreateFormView.cpp + + # boost 1.89 removed the boost_system stub library + substituteInPlace CMakeLists.txt --replace-fail \ + 'find_package(Boost REQUIRED COMPONENTS system program_options)' \ + 'find_package(Boost REQUIRED COMPONENTS program_options)' ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/gr/grip-search/package.nix b/pkgs/by-name/gr/grip-search/package.nix index feae85beb34c..eded3219e89e 100644 --- a/pkgs/by-name/gr/grip-search/package.nix +++ b/pkgs/by-name/gr/grip-search/package.nix @@ -44,6 +44,14 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + + # boost 1.89 removed the boost_system stub library + substituteInPlace \ + src/general/CMakeLists.txt \ + src/test/CMakeLists.txt \ + src/gripgen/CMakeLists.txt \ + src/grip/CMakeLists.txt \ + --replace-fail ' system' "" ''; meta = { diff --git a/pkgs/by-name/gr/grive2/package.nix b/pkgs/by-name/gr/grive2/package.nix index 8c2c7260d9e1..a229eae30de3 100644 --- a/pkgs/by-name/gr/grive2/package.nix +++ b/pkgs/by-name/gr/grive2/package.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'cmake_minimum_required(VERSION 2.8)' 'cmake_minimum_required(VERSION 3.10)' + + # boost 1.89 removed the boost_system stub library + substituteInPlace libgrive/CMakeLists.txt --replace-fail \ + 'find_package(Boost 1.40.0 COMPONENTS program_options filesystem unit_test_framework regex system REQUIRED)' \ + 'find_package(Boost 1.40.0 COMPONENTS program_options filesystem unit_test_framework regex REQUIRED)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/leatherman/package.nix b/pkgs/by-name/le/leatherman/package.nix index 00498584b6ad..c0e55cb81ee4 100644 --- a/pkgs/by-name/le/leatherman/package.nix +++ b/pkgs/by-name/le/leatherman/package.nix @@ -27,6 +27,20 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt --replace-fail \ "cmake_minimum_required(VERSION 3.2.2)" \ "cmake_minimum_required(VERSION 3.10)" + + # boost 1.89 removed the boost_system stub library + substituteInPlace \ + curl/CMakeLists.txt \ + dynamic_library/CMakeLists.txt \ + execution/CMakeLists.txt \ + file_util/CMakeLists.txt \ + locale/CMakeLists.txt \ + logging/CMakeLists.txt \ + ruby/CMakeLists.txt \ + util/CMakeLists.txt \ + windows/CMakeLists.txt \ + --replace-fail ' system' "" + substituteInPlace tests/CMakeLists.txt --replace-fail 'system ' "" ''; env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix index 995736bcfa41..e77179f3066d 100644 --- a/pkgs/by-name/li/libwhereami/package.nix +++ b/pkgs/by-name/li/libwhereami/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt --replace-fail \ "cmake_minimum_required(VERSION 3.2.2)" \ "cmake_minimum_required(VERSION 3.10)" + + # boost 1.89 removed the boost_system stub library + substituteInPlace CMakeLists.txt --replace-fail \ + 'list(APPEND BOOST_COMPONENTS filesystem regex system thread)' \ + 'list(APPEND BOOST_COMPONENTS filesystem regex thread)' ''; env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/by-name/lo/localproxy/package.nix b/pkgs/by-name/lo/localproxy/package.nix index 89c8e45be70a..bcc43899c26c 100644 --- a/pkgs/by-name/lo/localproxy/package.nix +++ b/pkgs/by-name/lo/localproxy/package.nix @@ -54,6 +54,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ./CMakeLists.txt --replace-fail \ "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" \ "cmake_minimum_required(VERSION 4.0)" + + # boost 1.89 removed the boost_system stub library + substituteInPlace CMakeLists.txt --replace-fail ' system' "" ''; # causes redefinition of _FORTIFY_SOURCE diff --git a/pkgs/by-name/op/openrw/package.nix b/pkgs/by-name/op/openrw/package.nix index 70ad5386fb75..8efbb13b15ab 100644 --- a/pkgs/by-name/op/openrw/package.nix +++ b/pkgs/by-name/op/openrw/package.nix @@ -34,10 +34,17 @@ stdenv.mkDerivation { hash = "sha256-2fQQL0JoV8YukU+VW2iWS4DpBi1j361SfiXRHRmocRg="; }; - postPatch = lib.optional (stdenv.cc.isClang && (lib.versionAtLeast stdenv.cc.version "9")) '' - substituteInPlace cmake_configure.cmake \ - --replace-fail 'target_link_libraries(rw_interface INTERFACE "stdc++fs")' "" - ''; + postPatch = + lib.optionalString (stdenv.cc.isClang && (lib.versionAtLeast stdenv.cc.version "9")) '' + substituteInPlace cmake_configure.cmake \ + --replace-fail 'target_link_libraries(rw_interface INTERFACE "stdc++fs")' "" + '' + + '' + # boost 1.89 removed the boost_system stub library + substituteInPlace CMakeLists.txt --replace-fail \ + 'find_package(Boost COMPONENTS program_options system REQUIRED)' \ + 'find_package(Boost COMPONENTS program_options REQUIRED)' + ''; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix index c9a2fc9c0321..4445a09f1765 100644 --- a/pkgs/by-name/sf/sfcgal/package.nix +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9caucSIEAjzc4cWShuwbBC+BLs5a3e3y58aT4aLzN5E="; }; + # boost 1.89 removed the boost_system stub library + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'set( SFCGAL_Boost_COMPONENTS thread system serialization )' \ + 'set( SFCGAL_Boost_COMPONENTS thread serialization )' + ''; + buildInputs = [ cgal boost diff --git a/pkgs/by-name/sr/srsran/package.nix b/pkgs/by-name/sr/srsran/package.nix index 96e805a122a2..a49abe56173f 100644 --- a/pkgs/by-name/sr/srsran/package.nix +++ b/pkgs/by-name/sr/srsran/package.nix @@ -55,6 +55,17 @@ stdenv.mkDerivation (finalAttrs: { zeromq ]; + # boost 1.89 removed the boost_system stub library + postPatch = '' + substituteInPlace cmake/modules/FindUHD.cmake --replace-fail \ + 'set(CMAKE_REQUIRED_LIBRARIES uhd boost_program_options boost_system)' \ + 'set(CMAKE_REQUIRED_LIBRARIES uhd boost_program_options)' + substituteInPlace lib/src/phy/rf/CMakeLists.txt --replace-fail \ + '/usr/lib/x86_64-linux-gnu/libboost_system.so' "" + substituteInPlace CMakeLists.txt --replace-fail \ + 'list(APPEND BOOST_REQUIRED_COMPONENTS "system")' "" + ''; + cmakeFlags = [ "-DENABLE_WERROR=OFF" (lib.cmakeBool "ENABLE_LTE_RATES" enableLteRates)