commit 9f879c1dc28086a9a03e2df951da3c1a4d86d480 · pyrox.dev/nixpkgs

+8 -5

pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch

···

       1
       1
       -
       --- a/CMakeLists.txt      2019-10-11 12:12:27.445417039 -0400

     

       2
       2
       -
       +++ b/CMakeLists.txt      2019-10-11 12:27:26.630691742 -0400

     

       3
       3
       -
       @@ -22,14 +22,6 @@

     

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

     

       2
       2
       +
       index 9ec0f23..35953d3 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -24,15 +24,6 @@ message("BLOSC_INSTALL_DIR='${BLOSC_INSTALL_DIR}'")

     

       4
       6
        
        message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'")

     

       5
       7
        
        message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'")

     

       6
       8
        
       

     

       7
       9
        
       -ExternalProject_Add(project_blosc

     

       8
       10
        
       -  PREFIX ${BLOSC_PREFIX}

     

       9
       11
        
       -  GIT_REPOSITORY https://github.com/Blosc/c-blosc.git

     

       12
       12
       +
       -  GIT_TAG main

     

       10
       13
        
       -  INSTALL_DIR ${BLOSC_INSTALL_DIR}

     

       11
       14
        
       -  CMAKE_ARGS ${BLOSC_CMAKE_ARGS}

     

       12
       15
        
       -)

     
···

       15
       18
        
        # sources

     

       16
       19
        
        set(SOURCES src/blosc_filter.c)

     

       17
       20
        
        set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c )

     

       18
       18
       -
       @@ -53,7 +45,6 @@

     

       21
       21
       +
       @@ -56,7 +47,6 @@ include_directories(${HDF5_INCLUDE_DIRS})

     

       19
       22
        
        # add blosc libraries

     

       20
       23
        
        add_library(blosc_shared SHARED IMPORTED)

     

       21
       21
       -
        set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX})

     

       24
       24
       +
        set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX})

     

       22
       25
        
       -add_dependencies(blosc_shared project_blosc)

     

       23
       26
        
        include_directories(${BLOSC_INSTALL_DIR}/include)

     

       24
       27

+10 -3

pkgs/by-name/hd/hdf5-blosc/package.nix

···

       5
       5
        
         cmake,

     

       6
       6
        
         hdf5,

     

       7
       7
        
         fetchFromGitHub,

     

       8
       8
       +
         nix-update-script,

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       stdenv.mkDerivation rec {

     

       11
       12
        
         pname = "hdf5-blosc";

     

       12
       12
       -
         version = "1.0.0";

     

       13
       13
       +
         version = "1.0.1";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchFromGitHub {

     

       15
       16
        
           owner = "Blosc";

     

       16
       17
        
           repo = "hdf5-blosc";

     

       17
       18
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs";

     

       19
       19
       +
           sha256 = "sha256-pM438hUEdzdZEGYxoKlBAHi1G27auj9uGSeiXwVPAE8=";

     

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       22
        
         patches = [ ./no-external-blosc.patch ];

     
···

       33
       34
        
         ];

     

       34
       35
        
       

     

       35
       36
        
         preConfigure = ''

     

       36
       36
       -
           substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'

     

       37
       37
       +
           substituteInPlace CMakeLists.txt --replace-fail 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'

     

       37
       38
        
         '';

     

       38
       39
        
       

     

       39
       40
        
         cmakeFlags = [

     

       40
       41
        
           "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin"

     

       42
       42
       +
           "-DCMAKE_INSTALL_LIBDIR=lib"

     

       43
       43
       +
           "-DBUILD_TESTS=ON"

     

       41
       44
        
         ];

     

       42
       45
        
       

     

       43
       46
        
         postInstall = ''

     

       44
       47
        
           mkdir -p $out/lib/pkgconfig

     

       45
       48
        
           substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc

     

       46
       49
        
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         doCheck = true;

     

       52
       52
       +
       

     

       53
       53
       +
         passthru.updateScript = nix-update-script { };

     

       47
       54
        
       

     

       48
       55
        
         meta = with lib; {

     

       49
       56
        
           description = "Filter for HDF5 that uses the Blosc compressor";