diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-17 12:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-17 12:01:24 +0000 |
| commit | 969a1796ef2433707a52cb128de0739b9e272a2e (patch) | |
| tree | a491c1d1b01dccd316fee2b8f230277877e156ef /pkgs/development/libraries | |
| parent | ab4849492ddab726337e643104096d91323f33e2 (diff) | |
| parent | d0f9857448e77df50d1e0b518ba0e835b797532a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 4498930bd838b..a76805d8d1fbd 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { }; }; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ + "-DTARGET_OS_IPHONE=0" + "-DTARGET_OS_WATCH=0" + ]; + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; description = "RDP viewer widget for GTK"; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 1ff5eb338a9ef..177189f765a2b 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.4.6"; + version = "5.1.6"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-eWUuORMZs6Bl/zFGYZkpgNAgJPIei+k0cQoWl+v+zxo="; + hash = "sha256-vhi/VzT/WmkfWi+hliN60o7eT+XgDr7T/k8DG3N1moc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 8fa003ed77414..3d7021bf35a8e 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "sha256-PuLpwhyyht+kkPUTrJTH+VTY5WuOhi2mIUDrFqubF+w="; + hash = "sha256-PuLpwhyyht+kkPUTrJTH+VTY5WuOhi2mIUDrFqubF+w="; }; nativeBuildInputs = [ perl cmake gfortran ]; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 3ed2f24f45f91..512398dde9a16 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: +{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib, Cocoa }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ hoppet lhapdf root5 zlib ]; + buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; patches = [ ./bad_code.patch |