commit 4eea7ff42736d0fba240ce2fadb7ce00aeffbaca · pyrox.dev/nixpkgs

+26

pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index d0e35b6..fc19477 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -96,20 +96,6 @@ endif()

     

       6
       6
       +
        # set the path where we can find the findXXX.cmake

     

       7
       7
       +
        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")

     

       8
       8
       +
        

     

       9
       9
       +
       -if(APPLE)

     

       10
       10
       +
       -

     

       11
       11
       +
       -  # avoid the cmake policy warning about @rpath in MacOSX

     

       12
       12
       +
       -  cmake_policy(SET CMP0042 NEW)

     

       13
       13
       +
       -

     

       14
       14
       +
       -  SET(CMAKE_MACOSX_RPATH TRUE) # initialize the MACOSX_RPATH property on all targets

     

       15
       15
       +
       -  SET(CMAKE_SKIP_BUILD_RPATH  FALSE) # don't skip the full RPATH for the build tree

     

       16
       16
       +
       -  # SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # when building, don't use the install RPATH already

     

       17
       17
       +
       -  SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) # when building, use the install RPATH already

     

       18
       18
       +
       -                                           # probably not needed

     

       19
       19
       +
       -  # SET(CMAKE_INSTALL_RPATH "") # the RPATH to be used when installing

     

       20
       20
       +
       -  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # LC_RPATH for CUDA and OpenCV etc written into executable

     

       21
       21
       +
       -endif(APPLE)

     

       22
       22
       +
       -

     

       23
       23
       +
        # FIND BOOST

     

       24
       24
       +
        set(BOOST_REQUIRED_COMPONENTS "atomic;chrono;date_time;filesystem;program_options;serialization;system;thread;timer;math_c99")

     

       25
       25
       +
        if(WIN32)

     

       26
       26
       +

+9 -4

pkgs/development/libraries/cctag/default.nix

···

       17
       17
        
         version = "1.0.4";

     

       18
       18
        
       

     

       19
       19
        
         outputs = [

     

       20
       20
       -
           "lib"

     

       20
       20
       +
           "out"

     

       21
       21
        
           "dev"

     

       22
       22
       -
           "out"

     

       23
       22
        
         ];

     

       24
       23
        
       

     

       25
       24
        
         src = fetchFromGitHub {

     
···

       41
       40
        
       

     

       42
       41
        
         patches = [

     

       43
       42
        
           ./cmake-install-include-dir.patch

     

       43
       43
       +
           ./cmake-no-apple-rpath.patch

     

       44
       44
        
         ];

     

       45
       45
        
       

     

       46
       46
       +
         # darwin boost doesn't have math_c99 libraries

     

       47
       47
       +
         postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       48
       48
       +
           substituteInPlace CMakeLists.txt --replace-warn ";math_c99" ""

     

       49
       49
       +
           substituteInPlace src/CMakeLists.txt --replace-warn "Boost::math_c99" ""

     

       50
       50
       +
         '';

     

       51
       51
       +
       

     

       46
       52
        
         nativeBuildInputs = [

     

       47
       53
        
           cmake

     

       48
       54
        
         ];

     
···

       57
       63
        
           opencv.cxxdev

     

       58
       64
        
         ];

     

       59
       65
        
       

     

       60
       60
       -
         # Tests are broken on Darwin (linking issue)

     

       61
       61
       -
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       66
       66
       +
         doCheck = true;

     

       62
       67
        
       

     

       63
       68
        
         meta = with lib; {

     

       64
       69
        
           description = "Detection of CCTag markers made up of concentric circles";