commit b499a5421d30625aee452c0b3394d2b6c50a5acb · pyrox.dev/nixpkgs

+14

pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch

···

       1
       1
       +
       diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake

     

       2
       2
       +
       index 949b80e..6ffcaa6 100644

     

       3
       3
       +
       --- a/cfitsio.pc.cmake

     

       4
       4
       +
       +++ b/cfitsio.pc.cmake

     

       5
       5
       +
       @@ -1,7 +1,7 @@

     

       6
       6
       +
        prefix=@CMAKE_INSTALL_PREFIX@

     

       7
       7
       +
        exec_prefix=${prefix}

     

       8
       8
       +
       -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@

     

       9
       9
       +
       -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

     

       10
       10
       +
       +libdir="@CMAKE_INSTALL_FULL_LIBDIR@"

     

       11
       11
       +
       +includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"

     

       12
       12
       +
        

     

       13
       13
       +
        Name: cfitsio

     

       14
       14
       +
        Description: FITS File Subroutine Library

-21

pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch

···

       1
       1
       -
       diff -ruN cfitsio/configure cfitsio-rpath-universal/configure

     

       2
       2
       -
       --- cfitsio/configure	2018-05-09 21:16:00.000000000 +0200

     

       3
       3
       -
       +++ cfitsio-rpath-universal/configure	2021-10-27 12:02:25.000000000 +0200

     

       4
       4
       -
       @@ -4829,16 +4829,7 @@

     

       5
       5
       -
            SHLIB_SUFFIX=".dylib"

     

       6
       6
       -
            CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}"

     

       7
       7
       -
            CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}"

     

       8
       8
       -
       -    case $host in

     

       9
       9
       -
       -        *darwin[56789]*)

     

       10
       10
       -
       -            SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"

     

       11
       11
       -
       -            ;;

     

       12
       12
       -
       -        *)

     

       13
       13
       -
       -            # Build 'Universal' binaries (i386 & x86_64 architectures) and

     

       14
       14
       -
       -            # use rpath token on Darwin 10.x or newer:

     

       15
       15
       -
       -            SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"

     

       16
       16
       -
       -            ;;

     

       17
       17
       -
       -    esac

     

       18
       18
       -
       +    SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"

     

       19
       19
       -
        

     

       20
       20
       -
            lhea_shlib_cflags="-fPIC -fno-common"

     

       21
       21
       -
            ;;

+46 -14

pkgs/by-name/cf/cfitsio/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         stdenv,

     

       3
       3
        
         lib,

     

       4
       4
       -
         fetchurl,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         gitUpdater,

     

       6
       6
       +
         cmake,

     

       5
       7
        
         bzip2,

     

       6
       8
        
         curl,

     

       7
       9
        
         zlib,

     
···

       9
       11
        
       

     

       10
       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
       13
        
         pname = "cfitsio";

     

       12
       12
       -
         version = "4.4.1";

     

       14
       14
       +
         version = "4.6.2";

     

       13
       15
        
       

     

       14
       14
       -
         src = fetchurl {

     

       15
       15
       -
           url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz";

     

       16
       16
       -
           hash = "sha256-ZqHcPyGAD57qvZ6sV3uR/N2aq7pnj7ujuFJzGRENHSU=";

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "HEASARC";

     

       18
       18
       +
           repo = finalAttrs.pname;

     

       19
       19
       +
           tag = "${finalAttrs.pname}-${finalAttrs.version}";

     

       20
       20
       +
           hash = "sha256-WLsX23hNhaITjCvMEV7NUEvyDfQiObSJt1qFC12z7wY=";

     

       17
       21
        
         };

     

       18
       22
        
       

     

       23
       23
       +
         outputs = [

     

       24
       24
       +
           "bin"

     

       25
       25
       +
           "dev"

     

       26
       26
       +
           "out"

     

       27
       27
       +
           "doc"

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       19
       30
        
         patches = [

     

       20
       20
       -
           ./darwin-rpath-universal.patch

     

       31
       31
       +
           ./cfitsio-pc-cmake.patch

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         nativeBuildInputs = [

     

       35
       35
       +
           cmake

     

       21
       36
        
         ];

     

       22
       37
        
       

     

       23
       38
        
         buildInputs = [

     
···

       26
       41
        
           zlib

     

       27
       42
        
         ];

     

       28
       43
        
       

     

       29
       29
       -
         configureFlags = [

     

       30
       30
       -
           "--with-bzip2=${bzip2.out}"

     

       31
       31
       -
           "--enable-reentrant"

     

       44
       44
       +
         cmakeFlags = [

     

       45
       45
       +
           "-DUSE_PTHREADS=ON"

     

       46
       46
       +
           "-DTESTS=ON"

     

       47
       47
       +
           "-DUTILS=ON"

     

       48
       48
       +
           "-DUSE_BZIP2=ON"

     

       32
       49
        
         ];

     

       33
       50
        
       

     

       34
       51
        
         env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD {

     
···

       36
       53
        
           # not showing us gethostbyname()

     

       37
       54
        
           NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1";

     

       38
       55
        
         };

     

       39
       39
       -
       

     

       40
       56
        
         hardeningDisable = [ "format" ];

     

       41
       57
        
       

     

       42
       42
       -
         # Shared-only build

     

       43
       43
       -
         buildFlags = [ "shared" ];

     

       58
       58
       +
         doCheck = true;

     

       59
       59
       +
         doInstallCheck = true;

     

       44
       60
        
       

     

       45
       45
       -
         postPatch = ''

     

       46
       46
       -
           sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in

     

       61
       61
       +
         # On testing cfitsio: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/README

     

       62
       62
       +
         installCheckPhase = ''

     

       63
       63
       +
           ./TestProg > testprog.lis

     

       64
       64
       +
           diff -s testprog.lis ../testprog.out

     

       65
       65
       +
           cmp testprog.fit ../testprog.std

     

       47
       66
        
         '';

     

       67
       67
       +
       

     

       68
       68
       +
         # Fixup installation

     

       69
       69
       +
         # Remove installed test tools and benchmark

     

       70
       70
       +
         postInstall = ''

     

       71
       71
       +
           install -Dm644 -t "$out/share/doc/${finalAttrs.pname}" ../docs/*.pdf

     

       72
       72
       +
           rm "$out/bin/cookbook"

     

       73
       73
       +
           rmdir "$out/bin"

     

       74
       74
       +
           rm "$bin/bin/smem" "$bin/bin/speed"

     

       75
       75
       +
         '';

     

       76
       76
       +
       

     

       77
       77
       +
         passthru = {

     

       78
       78
       +
           updateScript = gitUpdater { rev-prefix = "${finalAttrs.pname}-"; };

     

       79
       79
       +
         };

     

       48
       80
        
       

     

       49
       81
        
         meta = {

     

       50
       82
        
           homepage = "https://heasarc.gsfc.nasa.gov/fitsio/";