summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElian Doran <contact@eliandoran.me>2024-05-19 07:19:36 +0300
committerGitHub <noreply@github.com>2024-05-19 00:19:36 -0400
commit70e4cf2354cc94fc9351d477c302c5d3247863cc (patch)
tree14e03a30236fbf955418e93a51f353255cfe5609
parent68ead29211bb9890f494af3a8b5643a831d9d4c4 (diff)
netcdffortran: fix darwin build (#312683)
-rw-r--r--pkgs/development/libraries/netcdf-fortran/default.nix12
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 978f906b7adc..0edc956eee60 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation }:
+{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation, CoreServices, SystemConfiguration }:
stdenv.mkDerivation rec {
pname = "netcdf-fortran";
version = "4.4.5";
@@ -12,7 +12,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gfortran ];
buildInputs = [ netcdf hdf5 curl ]
- ++ lib.optional stdenv.isDarwin CoreFoundation;
+ ++ lib.optionals stdenv.isDarwin [
+ CoreFoundation
+ CoreServices
+ SystemConfiguration
+ ];
+ env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [
+ "-F${CoreServices}/Library/Frameworks"
+ "-F${SystemConfiguration}/Library/Frameworks"
+ ]);
doCheck = true;
FFLAGS = [ "-std=legacy" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82de9b0bdb77..1bff1bfb5cf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10841,7 +10841,7 @@ with pkgs;
netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
netcdffortran = callPackage ../development/libraries/netcdf-fortran {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration;
};
networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };