diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-29 15:13:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-29 15:13:15 +0200 |
| commit | a8126bbb7b9db99d659b265206726dfc2d7e29fc (patch) | |
| tree | de4f2570e0e1812645c1ee892ac17cd70d628965 /pkgs | |
| parent | 01a1d39a3e75fc26e347bb1a24533c90a3403312 (diff) | |
| parent | 4a6ab3798d7a9972afdb8bd70506019201edfd21 (diff) | |
| download | nixpkgs-a8126bbb7b9db99d659b265206726dfc2d7e29fc.tar nixpkgs-a8126bbb7b9db99d659b265206726dfc2d7e29fc.tar.gz nixpkgs-a8126bbb7b9db99d659b265206726dfc2d7e29fc.tar.bz2 nixpkgs-a8126bbb7b9db99d659b265206726dfc2d7e29fc.tar.lz nixpkgs-a8126bbb7b9db99d659b265206726dfc2d7e29fc.tar.xz nixpkgs-a8126bbb7b9db99d659b265206726dfc2d7e29fc.tar.zst nixpkgs-a8126bbb7b9db99d659b265206726dfc2d7e29fc.zip | |
Merge pull request #143526 from hjones2199/cfitsio-4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/astronomy/cfitsio/default.nix | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch b/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch index af38abf329e..0ea3b55ef70 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch +++ b/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch @@ -1,18 +1,18 @@ diff -ruN cfitsio/configure cfitsio-rpath-universal/configure --- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200 -+++ cfitsio-rpath-universal/configure 2018-05-31 12:02:25.000000000 +0200 -@@ -4727,16 +4727,7 @@ ++++ cfitsio-rpath-universal/configure 2021-10-27 12:02:25.000000000 +0200 +@@ -4829,16 +4829,7 @@ SHLIB_SUFFIX=".dylib" CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}" CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}" - case $host in - *darwin[56789]*) -- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" +- 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}" - ;; - *) - # Build 'Universal' binaries (i386 & x86_64 architectures) and - # use rpath token on Darwin 10.x or newer: -- 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}" +- 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}" - ;; - esac + 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}" diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index a3263f653b7..e38c384009c 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -1,14 +1,15 @@ -{ fetchurl, lib, stdenv, bzip2 }: +{ stdenv, lib, fetchurl, bzip2, zlib }: + stdenv.mkDerivation rec { pname = "cfitsio"; - version = "3.49"; + version = "4.0.0"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav"; + sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4="; }; - buildInputs = [ bzip2 ]; + buildInputs = [ bzip2 zlib ]; patches = [ ./darwin-rpath-universal.patch ]; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { advanced features for manipulating and filtering the information in FITS files. ''; + changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; license = licenses.mit; maintainers = [ maintainers.xbreak ]; platforms = with platforms; linux ++ darwin; |