nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cfitsio: add darwin support

Browse Source
This commit is contained in:
Sebastien Maret 2018-05-30 14:31:07 +02:00
parent 159c1576c8
commit 3d2fd2268b
3 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,25 @@
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

12
pkgs/development/libraries/cfitsio/darwin-universal.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN cfitsio/configure cfitsio-universal/configure
--- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200
+++ cfitsio-universal/configure 2018-05-30 14:26:03.000000000 +0200
@@ -4734,7 +4734,7 @@
*)
# 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 -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}"
;;
esac

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

@ -8,9 +8,11 @@
sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l";
};
patches = [ ./darwin-curl-config.patch ./darwin-universal.patch ];
# Shared-only build
buildFlags = "shared";
patchPhase = '' 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
'';
meta = with stdenv.lib; {
@ -27,6 +29,6 @@
'';
# Permissive BSD-style license.
license = "permissive";
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
};
}