commit a29f1e65e12c9a81f897bcd6f25421012d716aa0 · pyrox.dev/nixpkgs

-121

pkgs/by-name/ja/jasp-desktop/cmake.patch

··· 1 - diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake 2 - index edd96b0..1fbdb3c 100644 3 - --- a/Tools/CMake/Install.cmake 4 - +++ b/Tools/CMake/Install.cmake 5 - @@ -229,24 +229,10 @@ if(LINUX) 6 - install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/ 7 - DESTINATION ${JASP_INSTALL_RESOURCEDIR}) 8 - 9 - - install( 10 - - DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools 11 - - DESTINATION ${JASP_INSTALL_MODULEDIR} 12 - - REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE 13 - - REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE) 14 - - 15 - install( 16 - FILES ${MODULES_BINARY_PATH}/modules-settings.json 17 - DESTINATION ${JASP_INSTALL_MODULEDIR} 18 - ) 19 - - # we do not need renv-root in an install 20 - - #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/ 21 - - # DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root) 22 - - 23 - -if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway 24 - - install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/ 25 - - DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache) 26 - -endif() 27 - 28 - #Flatpak wrapper that sets some environment variables that JASP needs 29 - install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP 30 - diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake 31 - index a6673d9..a079021 100644 32 - --- a/Tools/CMake/Libraries.cmake 33 - +++ b/Tools/CMake/Libraries.cmake 34 - @@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) 35 - endif() 36 - endif() 37 - 38 - -set(Boost_USE_STATIC_LIBS ON) 39 - +add_definitions(-DBOOST_LOG_DYN_LINK) 40 - find_package( 41 - Boost 1.78 REQUIRED 42 - COMPONENTS filesystem 43 - @@ -185,7 +185,7 @@ if(LINUX) 44 - endif() 45 - 46 - message(CHECK_START "Looking for libreadstat.so") 47 - - find_file(LIBREADSTAT_LIBRARIES libreadstat.so 48 - + find_library(LIBREADSTAT_LIBRARIES libreadstat.so 49 - HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED) 50 - 51 - if(EXISTS ${LIBREADSTAT_LIBRARIES}) 52 - diff --git a/Tools/CMake/Modules.cmake b/Tools/CMake/Modules.cmake 53 - index ca8e040..875db1f 100644 54 - --- a/Tools/CMake/Modules.cmake 55 - +++ b/Tools/CMake/Modules.cmake 56 - @@ -13,19 +13,6 @@ configure_file(${PROJECT_SOURCE_DIR}/Modules/modules-settings.json 57 - configure_file(${PROJECT_SOURCE_DIR}/Modules/install-modules.R.in 58 - ${SCRIPT_DIRECTORY}/install-modules.R @ONLY) 59 - 60 - -#create modules install target 61 - -add_custom_target( 62 - - Modules 63 - - USES_TERMINAL 64 - - WORKING_DIRECTORY ${R_HOME_PATH} 65 - - DEPENDS ${JASP_MODULE_BUNDLE_MANAGER_LIBRARY}/jaspModuleBundleManager 66 - - DEPENDS ${SCRIPT_DIRECTORY}/install-modules.R 67 - - COMMAND ${CMAKE_COMMAND} -E env "JASP_R_HOME=${R_HOME_PATH}" ${R_EXECUTABLE} --slave --no-restore --no-save 68 - - --file=${SCRIPT_DIRECTORY}/install-modules.R 69 - - BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-downloaded.txt 70 - - BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-installed.txt 71 - - COMMENT "------ Installing Modules" 72 - -) 73 - 74 - 75 - 76 - diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake 77 - index 4e7c052..abb5b48 100644 78 - --- a/Tools/CMake/Programs.cmake 79 - +++ b/Tools/CMake/Programs.cmake 80 - @@ -38,8 +38,9 @@ if(NOT WIN32) 81 - endif() 82 - 83 - # ------ Linux Tools/Programs 84 - - 85 - -if(LINUX) 86 - +# We don't need to check for any dependencies that are used to build R packages 87 - +# since we build them separately 88 - +if(false) 89 - 90 - message(CHECK_START "Looking for 'gfortran'") 91 - find_program( 92 - diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake 93 - index 42e7b88..405b434 100644 94 - --- a/Tools/CMake/R.cmake 95 - +++ b/Tools/CMake/R.cmake 96 - @@ -867,14 +867,6 @@ else() 97 - configure_file(${PROJECT_SOURCE_DIR}/Modules/install-renv.R.in 98 - ${SCRIPT_DIRECTORY}/install-renv.R @ONLY) 99 - 100 - - 101 - -execute_process( 102 - - COMMAND_ECHO STDOUT 103 - - #ERROR_QUIET OUTPUT_QUIET 104 - - WORKING_DIRECTORY ${R_HOME_PATH} 105 - - COMMAND 106 - - ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/install-renv.R 107 - -) 108 - 109 - if(APPLE) 110 - # Patch renv 111 - @@ -937,8 +929,8 @@ execute_process( 112 - 113 - include(FindRPackagePath) 114 - 115 - -find_package_path(RCPP_PATH ${R_CPP_INCLUDES_LIBRARY} "Rcpp") 116 - -find_package_path(RINSIDE_PATH ${R_CPP_INCLUDES_LIBRARY} "RInside") 117 - +find_package_path(RCPP_PATH ${R_LIBRARY_PATH} "Rcpp") 118 - +find_package_path(RINSIDE_PATH ${R_LIBRARY_PATH} "RInside") 119 - 120 - set(RENV_PATH "${RENV_LIBRARY}/renv") 121 -

+29

pkgs/by-name/ja/jasp-desktop/disable-module-install-logic.patch

··· 1 + diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake 2 + index edd96b0..1fbdb3c 100644 3 + --- a/Tools/CMake/Install.cmake 4 + +++ b/Tools/CMake/Install.cmake 5 + @@ -229,24 +229,10 @@ if(LINUX) 6 + install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/ 7 + DESTINATION ${JASP_INSTALL_RESOURCEDIR}) 8 + 9 + - install( 10 + - DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools 11 + - DESTINATION ${JASP_INSTALL_MODULEDIR} 12 + - REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE 13 + - REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE) 14 + - 15 + install( 16 + FILES ${MODULES_BINARY_PATH}/modules-settings.json 17 + DESTINATION ${JASP_INSTALL_MODULEDIR} 18 + ) 19 + - # we do not need renv-root in an install 20 + - #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/ 21 + - # DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root) 22 + - 23 + -if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway 24 + - install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/ 25 + - DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache) 26 + -endif() 27 + 28 + #Flatpak wrapper that sets some environment variables that JASP needs 29 + install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP

+30

pkgs/by-name/ja/jasp-desktop/disable-renv-logic.patch

··· 1 + diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake 2 + index 42e7b88..405b434 100644 3 + --- a/Tools/CMake/R.cmake 4 + +++ b/Tools/CMake/R.cmake 5 + @@ -867,14 +867,6 @@ else() 6 + configure_file(${PROJECT_SOURCE_DIR}/Modules/install-renv.R.in 7 + ${SCRIPT_DIRECTORY}/install-renv.R @ONLY) 8 + 9 + - 10 + -execute_process( 11 + - COMMAND_ECHO STDOUT 12 + - #ERROR_QUIET OUTPUT_QUIET 13 + - WORKING_DIRECTORY ${R_HOME_PATH} 14 + - COMMAND 15 + - ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/install-renv.R 16 + -) 17 + 18 + if(APPLE) 19 + # Patch renv 20 + @@ -937,8 +929,8 @@ execute_process( 21 + 22 + include(FindRPackagePath) 23 + 24 + -find_package_path(RCPP_PATH ${R_CPP_INCLUDES_LIBRARY} "Rcpp") 25 + -find_package_path(RINSIDE_PATH ${R_CPP_INCLUDES_LIBRARY} "RInside") 26 + +find_package_path(RCPP_PATH ${R_LIBRARY_PATH} "Rcpp") 27 + +find_package_path(RINSIDE_PATH ${R_LIBRARY_PATH} "RInside") 28 + 29 + set(RENV_PATH "${RENV_LIBRARY}/renv") 30 +

+16

pkgs/by-name/ja/jasp-desktop/dont-check-for-module-deps.patch

··· 1 + diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake 2 + index 4e7c052..abb5b48 100644 3 + --- a/Tools/CMake/Programs.cmake 4 + +++ b/Tools/CMake/Programs.cmake 5 + @@ -38,8 +38,9 @@ if(NOT WIN32) 6 + endif() 7 + 8 + # ------ Linux Tools/Programs 9 + - 10 + -if(LINUX) 11 + +# We don't need to check for any dependencies that are used to build R packages 12 + +# since we build them separately 13 + +if(false) 14 + 15 + message(CHECK_START "Looking for 'gfortran'") 16 + find_program(

+13

pkgs/by-name/ja/jasp-desktop/link-boost-dynamically.patch

··· 1 + diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake 2 + index a6673d9..a079021 100644 3 + --- a/Tools/CMake/Libraries.cmake 4 + +++ b/Tools/CMake/Libraries.cmake 5 + @@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) 6 + endif() 7 + endif() 8 + 9 + -set(Boost_USE_STATIC_LIBS ON) 10 + +add_definitions(-DBOOST_LOG_DYN_LINK) 11 + find_package( 12 + Boost 1.78 REQUIRED 13 + COMPONENTS filesystem

+11 -6

pkgs/by-name/ja/jasp-desktop/package.nix

··· 3 3 stdenv, 4 4 5 5 fetchFromGitHub, 6 + fetchpatch, 6 7 7 8 buildEnv, 8 9 linkFarm, ··· 63 64 inherit version src; 64 65 65 66 patches = [ 66 - # - ensure boost is linked dynamically 67 - # - fix readstat's find logic 68 - # - disable some of the renv logic 69 - # - dont't check for dependencies required for building modules 70 - ./cmake.patch 67 + (fetchpatch { 68 + name = "readstat-use-find-library.patch"; 69 + url = "https://github.com/jasp-stats/jasp-desktop/commit/87c5a1f4724833aed0f7758499b917b3107ee196.patch"; 70 + hash = "sha256-0CrMKJkZpS97KmQFvZPyV1h3C7eKVr/IT0dARYBoKFo="; 71 + }) 72 + ./link-boost-dynamically.patch 73 + ./disable-module-install-logic.patch # don't try to install modules via cmake 74 + ./disable-renv-logic.patch 75 + ./dont-check-for-module-deps.patch # dont't check for dependencies required for building modules 71 76 ]; 72 77 73 78 cmakeFlags = [ ··· 100 105 qt6.qt5compat 101 106 ]; 102 107 103 - # needed so that JASPEngine can find libRInside.so 108 + # needed so that the linker can find libRInside.so 104 109 env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib"; 105 110 106 111 postInstall = ''