ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #64474 from xbreak/update/cfitsio-3470

Browse Source 
cfitsio: 3.450 -> 3.47
This commit is contained in:
Vladyslav M 2019-07-19 01:28:37 +03:00 committed by GitHub
commit 9bda7eb77e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/cfitsio/darwin-curl-config.patch
View File

@ -1,25 +0,0 @@
diff -ruN cfitsio/configure cfitsio-curl-config/configure
--- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200
+++ cfitsio-curl-config/configure 2018-05-30 13:28:58.000000000 +0200
@@ -4783,13 +4783,6 @@
CURL_LIB=""
CURL_INC=""
# Use curl-config to get compiler & linker flags, if available.
-# On Macs, prefer XCode curl-config, and reject MacPorts version
-# until further notice to prevent build errors:
-if test "x$EXT" = xdarwin -a -x /usr/bin/curl-config; then
- CURLCONFIG="/usr/bin/curl-config"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for curl-config... choosing /usr/bin/curl-config on Mac" >&5
-$as_echo "checking for curl-config... choosing /usr/bin/curl-config on Mac" >&6; }
-else
# Extract the first word of "curl-config", so it can be a program name with args.
set dummy curl-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -4833,7 +4826,6 @@
fi
fi
fi
-fi
CURLCONFIG=$ac_cv_prog_CURLCONFIG
if test -n "$CURLCONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLCONFIG" >&5

13
pkgs/development/libraries/cfitsio/default.nix
View File

@ -2,22 +2,23 @@
# Optional dependencies # Optional dependencies
, bzip2 ? null }: , bzip2 ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cfitsio-${version}"; pname = "cfitsio";
version = "3.450"; version = "3.47";
src = fetchurl { src = fetchurl {
url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio${builtins.replaceStrings ["."] [""] version}.tar.gz"; url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz";
sha256 = "0bmrkw6w65zb0k3mszaaqy1f4zjm2hl7njww74nb5v38wvdi4q5z"; sha256 = "1vzlxnrjckz78p2wf148v2z3krkwnykfqvlj42sz3q711vqid1a1";
}; };
buildInputs = [ bzip2 ]; buildInputs = [ bzip2 ];
patches = [ ./darwin-curl-config.patch ./darwin-rpath-universal.patch ]; patches = [ ./darwin-rpath-universal.patch ];
configureFlags = stdenv.lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; configureFlags = stdenv.lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}";
hardeningDisable = [ "format" ];
# Shared-only build # Shared-only build
buildFlags = "shared"; buildFlags = "shared";
postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in