diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index bc67996f..332a8ae2 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -196,9 +196,9 @@ else(ARGC LESS 1) foreach(component ${ARGV}) if(${component} STREQUAL "python") - set(component ${component}${Boost_PYVER}) + else() + set(components ${components} ${component}) endif() - set(components ${components} ${component}) endforeach() find_package(Boost 1.35.0 COMPONENTS ${components} system) diff --git a/flake.nix b/flake.nix index 94c9eb77..91408064 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,10 @@ runHook postBuild ''; - installPhase = "true"; + installPhase = '' + mkdir $out + mv /build/coriolis-2.x/*.* -t $out + ''; checkPhase = "true"; diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt index e4f22882..15eeb37d 100644 --- a/vlsisapd/CMakeLists.txt +++ b/vlsisapd/CMakeLists.txt @@ -14,8 +14,7 @@ message(STATUS "Boost_NO_SYSTEM_PATHS: ${Boost_NO_SYSTEM_PATHS}") set_cmake_policies() - find_package(Boost 1.35.0 REQUIRED COMPONENTS program_options regex) - #setup_boost(program_options python regex) + setup_boost(program_options python regex) find_package(LibXml2 REQUIRED) find_package(PythonSitePackages REQUIRED)